com php-src: Skip "useless" SSA variables for INIT_ARRAY, ADD_ARRAY_ELEMENT, FE_RESET_R: ext/opcache/O ptimizer/zend_inference.c
ext/opcache/Optimizer/zend_ss a.c

From: Date: Tue, 22 Dec 2015 14:35:08 +0000
Subject: com php-src: Skip "useless" SSA variables for INIT_ARRAY, ADD_ARRAY_ELEMENT, FE_RESET_R: ext/opcache/O ptimizer/zend_inference.c
ext/opcache/Optimizer/zend_ss a.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90388@lists.php.net to get a copy of this message
Commit: a75c6d5fb2adc1e2e5c9310ab671ae8e891715e0 Author: Dmitry Stogov <dmitry@zend.com> Tue, 22 Dec 2015 17:35:08 +0300 Parents: b4b6d589909d769fa84fee1d7b66a10a7a992783 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a75c6d5fb2adc1e2e5c9310ab671ae8e891715e0 Log: Skip "useless" SSA variables for INIT_ARRAY, ADD_ARRAY_ELEMENT, FE_RESET_R Changed paths: M ext/opcache/Optimizer/zend_inference.c M ext/opcache/Optimizer/zend_ssa.c Diff: diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index 272d62b..3793ea4 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -3246,7 +3246,7 @@ static void zend_update_type_info(const zend_op_array *op_array, break; case ZEND_INIT_ARRAY: case ZEND_ADD_ARRAY_ELEMENT: - if (opline->op1_type == IS_CV) { + if (opline->op1_type == IS_CV && ssa_ops[i].op1_def >= 0) { if (opline->extended_value & ZEND_ARRAY_ELEMENT_REF) { tmp = (MAY_BE_REF | t1) & ~(MAY_BE_UNDEF|MAY_BE_RC1|MAY_BE_RCN); if (t1 & MAY_BE_UNDEF) { @@ -3320,7 +3320,7 @@ static void zend_update_type_info(const zend_op_array *op_array, // break; case ZEND_FE_RESET_R: case ZEND_FE_RESET_RW: - if (ssa_ops[i].op1_def) { + if (ssa_ops[i].op1_def >= 0) { tmp = t1; if (t1 & MAY_BE_RCN) { tmp |= MAY_BE_RC1; diff --git a/ext/opcache/Optimizer/zend_ssa.c b/ext/opcache/Optimizer/zend_ssa.c index 27f80f1..1860c7b 100644 --- a/ext/opcache/Optimizer/zend_ssa.c +++ b/ext/opcache/Optimizer/zend_ssa.c @@ -278,7 +278,7 @@ 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 (opline->op1_type == IS_CV) { + if ((build_flags & ZEND_SSA_RC_INFERENCE) && 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++; @@ -288,7 +288,6 @@ static int zend_ssa_rename(const zend_op_array *op_array, uint32_t build_flags, case ZEND_SEND_VAR_NO_REF: case ZEND_SEND_VAR_EX: case ZEND_SEND_REF: - case ZEND_FE_RESET_R: case ZEND_FE_RESET_RW: //TODO: ??? if (opline->op1_type == IS_CV) { @@ -298,6 +297,14 @@ static int zend_ssa_rename(const zend_op_array *op_array, uint32_t build_flags, //NEW_SSA_VAR(opline->op1.var) } break; + case ZEND_FE_RESET_R: + if ((build_flags & ZEND_SSA_RC_INFERENCE) && 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++; + //NEW_SSA_VAR(opline->op1.var) + } + break; case ZEND_ASSIGN_ADD: case ZEND_ASSIGN_SUB: case ZEND_ASSIGN_MUL:

« previous php.cvs (#90388) next »