com php-src: Always create ARRAY_ELEM ssa var for ELE M_REF: ext/opcache/Optimizer/zend_ssa.c
| From: | Nikita Popov | Date: | Tue, 22 Dec 2015 22:08:26 +0000 |
| Subject: | com php-src: Always create ARRAY_ELEM ssa var for ELE M_REF: ext/opcache/Optimizer/zend_ssa.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90404@lists.php.net to get a copy of this message | ||
Commit: fdfbeeb296ee3e617d280ed2827ac16b100b0d14
Author: Nikita Popov <nikic@php.net> Tue, 22 Dec 2015 23:08:26 +0100
Parents: 5c1c8f1decfa6206645df2a8a1b56062849d53aa
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fdfbeeb296ee3e617d280ed2827ac16b100b0d14
Log:
Always create ARRAY_ELEM ssa var for ELEM_REF
Changed paths:
M ext/opcache/Optimizer/zend_ssa.c
Diff:
diff --git a/ext/opcache/Optimizer/zend_ssa.c b/ext/opcache/Optimizer/zend_ssa.c
index 1860c7b..46c3928 100644
--- a/ext/opcache/Optimizer/zend_ssa.c
+++ b/ext/opcache/Optimizer/zend_ssa.c
@@ -278,7 +278,9 @@ static int zend_ssa_rename(const zend_op_array *op_array, uint32_t build_flags,
case ZEND_ADD_ARRAY_ELEMENT:
ssa_ops[k].result_use = var[EX_VAR_TO_NUM(opline->result.var)];
case ZEND_INIT_ARRAY:
- if ((build_flags & ZEND_SSA_RC_INFERENCE) && opline->op1_type == IS_CV) {
+ if (((build_flags & ZEND_SSA_RC_INFERENCE)
+ || (opline->extended_value & ZEND_ARRAY_ELEMENT_REF))
+ && opline->op1_type == IS_CV) {
ssa_ops[k].op1_def = ssa_vars_count;
var[EX_VAR_TO_NUM(opline->op1.var)] = ssa_vars_count;
ssa_vars_count++;