From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 26 Aug 2014 21:39:39 +0000 (+0400)
Subject: Fixed incorrect ZEND_INIT_FCALL_BY_NAME -> ZEND_INIT_FCALL conversion
X-Git-Tag: PRE_PHP7_REMOVALS~289
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=614bc31635502ec33b44ede618bf49742fbd13a6;p=php

Fixed incorrect ZEND_INIT_FCALL_BY_NAME -> ZEND_INIT_FCALL conversion
---

diff --git a/ext/opcache/Optimizer/optimize_func_calls.c b/ext/opcache/Optimizer/optimize_func_calls.c
index 853d4bd7f4..13aa377568 100644
--- a/ext/opcache/Optimizer/optimize_func_calls.c
+++ b/ext/opcache/Optimizer/optimize_func_calls.c
@@ -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;