Fixed trace type inference

dstogov · dstogov · commit 4c15e7f97f40 · 2023-09-06T01:10:45.000+03:00
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -6985,7 +6985,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)) {
 					uint8_t type = IS_UNKNOWN;

Original file line number	Diff line number	Diff line change
`@@ -6985,7 +6985,7 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`6985`	`6985`	`}`
`6986`	`6986`	`}`
`6987`	`6987`	`if (ssa_op->op1_def >= 0`
`6988`		`- && (opline->opcode != ZEND_QM_ASSIGN`
	`6988`	`+ && ((opline->opcode != ZEND_QM_ASSIGN && opline->opcode != ZEND_CAST)`
`6989`	`6989`	`\|\| opline->result_type != IS_CV`
`6990`	`6990`	`\|\| opline->result.var != opline->op1.var)) {`
`6991`	`6991`	`uint8_t type = IS_UNKNOWN;`