summaryrefslogtreecommitdiff
path: root/Zend/zend_compile.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2019-07-05 12:03:25 +0300
committerDmitry Stogov <dmitry@zend.com>2019-07-05 12:03:25 +0300
commit48ca5a1e176c5301fedd1bc4f661969d6f9a49eb (patch)
treed9a6303bc1a0a054c1acd0d9612256e0ea887c74 /Zend/zend_compile.c
parent24ecfcc8339d0158d5cd209b8737d8d764703ded (diff)
downloadphp-git-48ca5a1e176c5301fedd1bc4f661969d6f9a49eb.tar.gz
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.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 6682d2b454..a8b831fef2 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2849,7 +2849,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();
@@ -2858,8 +2859,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;
@@ -2870,8 +2871,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;
@@ -2882,8 +2883,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;