]> granicus.if.org Git - php/commitdiff
Fixed incorrect ZEND_INIT_FCALL_BY_NAME -> ZEND_INIT_FCALL conversion
authorDmitry Stogov <dmitry@zend.com>
Tue, 26 Aug 2014 21:39:39 +0000 (01:39 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 26 Aug 2014 21:39:39 +0000 (01:39 +0400)
ext/opcache/Optimizer/optimize_func_calls.c

index 853d4bd7f40f022bdc820540904d5d32c8d5467e..13aa3775683ae21fe1b4c53a2c7680b1aabc837d 100644 (file)
@@ -83,9 +83,9 @@ static void optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx
                                        } else {
                                                ZEND_ASSERT(0);
                                        }
-                               } else if (opline->extended_value == 0 &&
-                                          call_stack[call].opline &&
+                               } else if (call_stack[call].opline &&
                                           call_stack[call].opline->opcode == ZEND_INIT_FCALL_BY_NAME &&
+                                          call_stack[call].opline->extended_value == 0 &&
                                                   ZEND_OP2_IS_CONST_STRING(call_stack[call].opline)) {
 
                                        zend_op *fcall = call_stack[call].opline;