diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-10-04 16:53:01 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-10-04 16:53:01 +0300 |
| commit | e70618aff6f447a298605d07648f2ce9e5a284f5 (patch) | |
| tree | fb72291c9346d131c7d787411e5ce4161010f987 /ext/opcache/Optimizer/optimize_func_calls.c | |
| parent | 2cbc75ec63dbe9aed6b8480444b4f73693da1bd1 (diff) | |
| download | php-git-e70618aff6f447a298605d07648f2ce9e5a284f5.tar.gz | |
Changed the way VM accesses constant operands in 64-bit builds.
Diffstat (limited to 'ext/opcache/Optimizer/optimize_func_calls.c')
| -rw-r--r-- | ext/opcache/Optimizer/optimize_func_calls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/opcache/Optimizer/optimize_func_calls.c b/ext/opcache/Optimizer/optimize_func_calls.c index 5f3dc35dff..1548260b60 100644 --- a/ext/opcache/Optimizer/optimize_func_calls.c +++ b/ext/opcache/Optimizer/optimize_func_calls.c @@ -123,7 +123,7 @@ static void zend_try_inline_call(zend_op_array *op_array, zend_op *fcall, zend_o i = fcall->extended_value; do { - if (Z_CONSTANT_P(RT_CONSTANT(&func->op_array, func->op_array.opcodes[i].op2))) { + if (Z_CONSTANT_P(RT_CONSTANT(&func->op_array.opcodes[i], func->op_array.opcodes[i].op2))) { return; } i++; @@ -133,7 +133,7 @@ static void zend_try_inline_call(zend_op_array *op_array, zend_op *fcall, zend_o if (RETURN_VALUE_USED(opline)) { zval zv; - ZVAL_DUP(&zv, RT_CONSTANT(&func->op_array, ret_opline->op1)); + ZVAL_DUP(&zv, RT_CONSTANT(ret_opline, ret_opline->op1)); opline->opcode = ZEND_QM_ASSIGN; opline->op1_type = IS_CONST; opline->op1.constant = zend_optimizer_add_literal(op_array, &zv); |