diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-07-05 12:16:30 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-07-05 12:16:30 +0300 |
| commit | 1b5b8175aff0fba41ce94d75d1ddf0f7be630b9c (patch) | |
| tree | 7fef7cefe333517cf9640eee34b198e865a4f9e5 /Zend/zend_compile.c | |
| parent | 215e9d069c3dae40d94894d1a938d771cecc2549 (diff) | |
| parent | 48ca5a1e176c5301fedd1bc4f661969d6f9a49eb (diff) | |
| download | php-git-1b5b8175aff0fba41ce94d75d1ddf0f7be630b9c.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Replace ZEND_ASSIGN_ADD (and others) by ZEND_ASSIGN_OP, ZEND_ASSIGN_DIM_OP, ZEND_ASSGIN_OBJ_OP and ZEND_ASSIGN_STATIC_PROP_OP
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 3f9785a63d..005127eb63 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -2826,7 +2826,8 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast) /* {{{ */ zend_delayed_compile_var(&var_node, var_ast, BP_VAR_RW, 0); zend_compile_expr(&expr_node, expr_ast); zend_delayed_compile_end(offset); - zend_emit_op(result, opcode, &var_node, &expr_node); + opline = zend_emit_op(result, ZEND_ASSIGN_OP, &var_node, &expr_node); + opline->extended_value = opcode; return; case ZEND_AST_STATIC_PROP: offset = zend_delayed_compile_begin(); @@ -2835,8 +2836,8 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast) /* {{{ */ opline = zend_delayed_compile_end(offset); cache_slot = opline->extended_value; - opline->opcode = opcode; - opline->extended_value = ZEND_ASSIGN_STATIC_PROP; + opline->opcode = ZEND_ASSIGN_STATIC_PROP_OP; + opline->extended_value = opcode; opline = zend_emit_op_data(&expr_node); opline->extended_value = cache_slot; @@ -2847,8 +2848,8 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast) /* {{{ */ zend_compile_expr(&expr_node, expr_ast); opline = zend_delayed_compile_end(offset); - opline->opcode = opcode; - opline->extended_value = ZEND_ASSIGN_DIM; + opline->opcode = ZEND_ASSIGN_DIM_OP; + opline->extended_value = opcode; zend_emit_op_data(&expr_node); return; @@ -2859,8 +2860,8 @@ void zend_compile_compound_assign(znode *result, zend_ast *ast) /* {{{ */ opline = zend_delayed_compile_end(offset); cache_slot = opline->extended_value; - opline->opcode = opcode; - opline->extended_value = ZEND_ASSIGN_OBJ; + opline->opcode = ZEND_ASSIGN_OBJ_OP; + opline->extended_value = opcode; opline = zend_emit_op_data(&expr_node); opline->extended_value = cache_slot; |