Merge branch 'PHP-8.1' into PHP-8.2

dstogov · dstogov · commit 176b79fe7fdc · 2023-10-09T22:58:21.000+03:00
* PHP-8.1:
  Fix incorrect trace type inference
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -6299,7 +6299,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
`@@ -6299,7 +6299,7 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`6299`	`6299`	`}`
`6300`	`6300`	`}`
`6301`	`6301`	`if (ssa_op->op1_def >= 0`
`6302`		`- && (opline->opcode != ZEND_QM_ASSIGN`
	`6302`	`+ && ((opline->opcode != ZEND_QM_ASSIGN && opline->opcode != ZEND_CAST)`
`6303`	`6303`	`\|\| opline->result_type != IS_CV`
`6304`	`6304`	`\|\| opline->result.var != opline->op1.var)) {`
`6305`	`6305`	`zend_uchar type = IS_UNKNOWN;`