Fix incorrect trace type inference

dstogov · dstogov · commit 44a701604994 · 2023-10-09T22:57:31.000+03:00
Fixes GH-12365
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -6324,7 +6324,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 					}
 				}
 				if (ssa_op->op1_def >= 0
-				 && (opline->opcode != ZEND_QM_ASSIGN
+				 && ((opline->opcode != ZEND_QM_ASSIGN && opline->opcode != ZEND_CAST)
 				  || opline->result_type != IS_CV
 				  || opline->result.var != opline->op1.var)) {
 					zend_uchar type = IS_UNKNOWN;

Original file line number	Diff line number	Diff line change
`@@ -6324,7 +6324,7 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`6324`	`6324`	`}`
`6325`	`6325`	`}`
`6326`	`6326`	`if (ssa_op->op1_def >= 0`
`6327`		`- && (opline->opcode != ZEND_QM_ASSIGN`
	`6327`	`+ && ((opline->opcode != ZEND_QM_ASSIGN && opline->opcode != ZEND_CAST)`
`6328`	`6328`	`\|\| opline->result_type != IS_CV`
`6329`	`6329`	`\|\| opline->result.var != opline->op1.var)) {`
`6330`	`6330`	`zend_uchar type = IS_UNKNOWN;`