From: Nikita Popov Date: Thu, 30 Jun 2016 15:42:57 +0000 (+0200) Subject: Fix RT_CONSTANT_EX typo X-Git-Tag: php-7.1.0alpha3~54 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f8273e3bf883fe43d995683fbf1c0b2e99cfa25;p=php Fix RT_CONSTANT_EX typo --- diff --git a/ext/opcache/Optimizer/optimize_func_calls.c b/ext/opcache/Optimizer/optimize_func_calls.c index 79c1d90232..bf84a7a383 100644 --- a/ext/opcache/Optimizer/optimize_func_calls.c +++ b/ext/opcache/Optimizer/optimize_func_calls.c @@ -103,7 +103,7 @@ static void zend_try_inline_call(zend_op_array *op_array, zend_op *fcall, zend_o uint32_t n = fcall->extended_value; do { - if (Z_CONSTANT_P(RT_CONSTANT_EX(&func->op_array, func->op_array.opcodes[n].op2))) { + if (Z_CONSTANT_P(RT_CONSTANT(&func->op_array, func->op_array.opcodes[n].op2))) { return; } n++; @@ -112,7 +112,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_EX(&func->op_array, ret_opline->op1)); + ZVAL_DUP(&zv, RT_CONSTANT(&func->op_array, ret_opline->op1)); opline->opcode = ZEND_QM_ASSIGN; opline->op1_type = IS_CONST; opline->op1.constant = zend_optimizer_add_literal(op_array, &zv);