com php-src: Fixed incorrect ZEND_INIT_FCALL_BY_NAME -> ZEND_INIT_FCALL conversion: ext/opcache/Optimi zer/optimize_func_calls.c
| From: | Dmitry Stogov | Date: | Tue, 26 Aug 2014 21:39:39 +0000 |
| Subject: | com php-src: Fixed incorrect ZEND_INIT_FCALL_BY_NAME -> ZEND_INIT_FCALL conversion: ext/opcache/Optimi zer/optimize_func_calls.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81137@lists.php.net to get a copy of this message | ||
Commit: 614bc31635502ec33b44ede618bf49742fbd13a6
Author: Dmitry Stogov <dmitry@zend.com> Wed, 27 Aug 2014 01:39:39 +0400
Parents: f3b629c98205d35e48fd10980633212557345709
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=614bc31635502ec33b44ede618bf49742fbd13a6
Log:
Fixed incorrect ZEND_INIT_FCALL_BY_NAME -> ZEND_INIT_FCALL conversion
Changed paths:
M ext/opcache/Optimizer/optimize_func_calls.c
Diff:
diff --git a/ext/opcache/Optimizer/optimize_func_calls.c
b/ext/opcache/Optimizer/optimize_func_calls.c
index 853d4bd..13aa377 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;