Result of ASSIGN may be different from the assigned value when LHS is a typed reference

dstogov · dstogov · commit f767807986cf · 2020-03-18T01:40:41.000+03:00
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -2711,7 +2711,10 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 						type = STACK_VAR_TYPE(opline->op1.var);
 					}
 				} else if (opline->opcode == ZEND_ASSIGN) {
-					if (opline->op2_type != IS_CONST) {
+					if (opline->op2_type != IS_CONST
+					 && ssa_op->op1_use >= 0
+					 /* assignment to typed reference may cause conversion */
+					 && (ssa->var_info[ssa_op->op1_use].type & MAY_BE_REF) == 0) {
 						/* copy */
 						type = STACK_VAR_TYPE(opline->op2.var);
 					}

Original file line number	Diff line number	Diff line change
`@@ -2711,7 +2711,10 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`2711`	`2711`	`type = STACK_VAR_TYPE(opline->op1.var);`
`2712`	`2712`	`}`
`2713`	`2713`	`} else if (opline->opcode == ZEND_ASSIGN) {`
`2714`		`- if (opline->op2_type != IS_CONST) {`
	`2714`	`+ if (opline->op2_type != IS_CONST`
	`2715`	`+ && ssa_op->op1_use >= 0`
	`2716`	`+ /* assignment to typed reference may cause conversion */`
	`2717`	`+ && (ssa->var_info[ssa_op->op1_use].type & MAY_BE_REF) == 0) {`
`2715`	`2718`	`/* copy */`
`2716`	`2719`	`type = STACK_VAR_TYPE(opline->op2.var);`
`2717`	`2720`	`}`