]> granicus.if.org Git - php/commitdiff
Fix RT_CONSTANT_EX typo
authorNikita Popov <nikic@php.net>
Thu, 30 Jun 2016 15:42:57 +0000 (17:42 +0200)
committerNikita Popov <nikic@php.net>
Thu, 30 Jun 2016 15:42:57 +0000 (17:42 +0200)
ext/opcache/Optimizer/optimize_func_calls.c

index 79c1d90232a0bf2dee567846aa1b50ef8ff7e626..bf84a7a383ef3851d0510a0fdb9f8189663e1da7 100644 (file)
@@ -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);