diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-10-11 12:28:20 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-10-11 12:54:07 +0300 |
| commit | 2068ce9adf05e6984cd2a3ff040d8967634d28cf (patch) | |
| tree | c269d1c21d1d3b868e850a39e133adf956aa3f7f /ext/opcache/Optimizer/zend_dump.c | |
| parent | 85c8c5bfaccc4370fb3cac2c2ab9f30ff2ce71e4 (diff) | |
| download | php-git-2068ce9adf05e6984cd2a3ff040d8967634d28cf.tar.gz | |
Use RT_CONSTANT() or CT_CONSTANT() macro depending on ZEND_ACC_DONE_PASS_TWO flag
Diffstat (limited to 'ext/opcache/Optimizer/zend_dump.c')
| -rw-r--r-- | ext/opcache/Optimizer/zend_dump.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/opcache/Optimizer/zend_dump.c b/ext/opcache/Optimizer/zend_dump.c index 7ec76438bf..68b3d4a99f 100644 --- a/ext/opcache/Optimizer/zend_dump.c +++ b/ext/opcache/Optimizer/zend_dump.c @@ -585,7 +585,7 @@ static void zend_dump_op(const zend_op_array *op_array, const zend_basic_block * } if (opline->op1_type == IS_CONST) { - zend_dump_const(CRT_CONSTANT_EX(op_array, opline, opline->op1, (dump_flags & ZEND_DUMP_RT_CONSTANTS))); + zend_dump_const(CRT_CONSTANT(opline->op1)); } else if (opline->op1_type & (IS_CV|IS_VAR|IS_TMP_VAR)) { if (ssa && ssa->ops) { int ssa_var_num = ssa->ops[opline - op_array->opcodes].op1_use; @@ -621,7 +621,7 @@ static void zend_dump_op(const zend_op_array *op_array, const zend_basic_block * } if (opline->op2_type == IS_CONST) { - zval *op = CRT_CONSTANT_EX(op_array, opline, opline->op2, (dump_flags & ZEND_DUMP_RT_CONSTANTS)); + zval *op = CRT_CONSTANT(opline->op2); if (opline->opcode == ZEND_SWITCH_LONG || opline->opcode == ZEND_SWITCH_STRING) { HashTable *jumptable = Z_ARRVAL_P(op); zend_string *key; @@ -687,7 +687,7 @@ static void zend_dump_op(const zend_op_array *op_array, const zend_basic_block * } } if (opline->result_type == IS_CONST) { - zend_dump_const(CRT_CONSTANT_EX(op_array, opline, opline->result, (dump_flags & ZEND_DUMP_RT_CONSTANTS))); + zend_dump_const(CRT_CONSTANT(opline->result)); #if 0 } else if (opline->result_type & IS_SMART_BRANCH_JMPZ) { fprintf(stderr, " jmpz"); |