Fixed incorrect type inference

dstogov · dstogov · commit 1d98bd41e5ea · 2020-05-28T17:10:05.000+03:00
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
@@ -2539,8 +2539,8 @@ static zend_always_inline int _zend_update_type_info(
 				}
 			} else if (opline->opcode == ZEND_ASSIGN_OBJ_OP) {
 				if (opline->op1_type == IS_CV) {
-					tmp = (orig & (MAY_BE_REF|MAY_BE_OBJECT))|MAY_BE_RC1|MAY_BE_RCN;
-					UPDATE_SSA_TYPE(tmp, ssa_op->op1_def);
+					orig = (orig & (MAY_BE_REF|MAY_BE_OBJECT))|MAY_BE_RC1|MAY_BE_RCN;
+					UPDATE_SSA_TYPE(orig, ssa_op->op1_def);
 					COPY_SSA_OBJ_TYPE(ssa_op->op1_use, ssa_op->op1_def);
 				}
 			} else if (opline->opcode == ZEND_ASSIGN_STATIC_PROP) {

Original file line number	Diff line number	Diff line change
`@@ -2539,8 +2539,8 @@ static zend_always_inline int _zend_update_type_info(`
`2539`	`2539`	`}`
`2540`	`2540`	`} else if (opline->opcode == ZEND_ASSIGN_OBJ_OP) {`
`2541`	`2541`	`if (opline->op1_type == IS_CV) {`
`2542`		`- tmp = (orig & (MAY_BE_REF\|MAY_BE_OBJECT))\|MAY_BE_RC1\|MAY_BE_RCN;`
`2543`		`- UPDATE_SSA_TYPE(tmp, ssa_op->op1_def);`
	`2542`	`+ orig = (orig & (MAY_BE_REF\|MAY_BE_OBJECT))\|MAY_BE_RC1\|MAY_BE_RCN;`
	`2543`	`+ UPDATE_SSA_TYPE(orig, ssa_op->op1_def);`
`2544`	`2544`	`COPY_SSA_OBJ_TYPE(ssa_op->op1_use, ssa_op->op1_def);`
`2545`	`2545`	`}`
`2546`	`2546`	`} else if (opline->opcode == ZEND_ASSIGN_STATIC_PROP) {`