@@ -323,7 +323,7 @@ static inline zend_bool can_elide_return_type_check(
323323}
324324
325325static zend_bool opline_supports_assign_contraction (
326- zend_ssa * ssa , zend_op * opline , int src_var , uint32_t cv_var ) {
326+ zend_op_array * op_array , zend_ssa * ssa , zend_op * opline , int src_var , uint32_t cv_var ) {
327327 if (opline -> opcode == ZEND_NEW ) {
328328 /* see Zend/tests/generators/aborted_yield_during_new.phpt */
329329 return 0 ;
@@ -357,6 +357,13 @@ static zend_bool opline_supports_assign_contraction(
357357 return opline -> op1_type != IS_CV || opline -> op1 .var != cv_var ;
358358 }
359359
360+ if (opline -> opcode == ZEND_ASSIGN_OP
361+ && opline -> op1_type == IS_CV
362+ && opline -> op1 .var == cv_var
363+ && zend_may_throw (opline , & ssa -> ops [ssa -> vars [src_var ].definition ], op_array , ssa )) {
364+ return 0 ;
365+ }
366+
360367 return 1 ;
361368}
362369
@@ -1310,7 +1317,7 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
13101317 && !ssa -> vars [src_var ].phi_use_chain
13111318 && !ssa -> vars [src_var ].sym_use_chain
13121319 && opline_supports_assign_contraction (
1313- ssa , & op_array -> opcodes [ssa -> vars [src_var ].definition ],
1320+ op_array , ssa , & op_array -> opcodes [ssa -> vars [src_var ].definition ],
13141321 src_var , opline -> result .var )
13151322 && !variable_defined_or_used_in_range (ssa , EX_VAR_TO_NUM (opline -> result .var ),
13161323 ssa -> vars [src_var ].definition + 1 , op_1 )
@@ -1467,7 +1474,7 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
14671474 && !ssa -> vars [src_var ].phi_use_chain
14681475 && !ssa -> vars [src_var ].sym_use_chain
14691476 && opline_supports_assign_contraction (
1470- ssa , & op_array -> opcodes [ssa -> vars [src_var ].definition ],
1477+ op_array , ssa , & op_array -> opcodes [ssa -> vars [src_var ].definition ],
14711478 src_var , opline -> op1 .var )
14721479 && !variable_defined_or_used_in_range (ssa , EX_VAR_TO_NUM (opline -> op1 .var ),
14731480 ssa -> vars [src_var ].definition + 1 , op_1 )
0 commit comments