summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-08-27 01:39:39 +0400
committerDmitry Stogov <dmitry@zend.com>2014-08-27 01:39:39 +0400
commit614bc31635502ec33b44ede618bf49742fbd13a6 (patch)
tree2bc66cf9e998285e77d6ec80ea21a41cc29d5d27
parentf3b629c98205d35e48fd10980633212557345709 (diff)
downloadphp-git-614bc31635502ec33b44ede618bf49742fbd13a6.tar.gz
Fixed incorrect ZEND_INIT_FCALL_BY_NAME -> ZEND_INIT_FCALL conversion
-rw-r--r--ext/opcache/Optimizer/optimize_func_calls.c4
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 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;