Merge branch 'PHP-8.4'

dstogov · dstogov · commit 0949e7acc737 · 2024-12-03T20:43:02.000+03:00
* PHP-8.4: Fix phpGH-17003: Pecl 8.4 tracing JIT crash (php#17032)
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -6902,7 +6902,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 
 							ssa->var_info[j].type &= ~MAY_BE_GUARD;
 							op_type = concrete_type(ssa->var_info[j].type);
-							if (!zend_jit_type_guard(&ctx, opline, EX_NUM_TO_VAR(i), op_type)) {
+							if (!zend_jit_type_guard(&ctx, NULL, EX_NUM_TO_VAR(i), op_type)) {
 								goto jit_failure;
 							}
 							SET_STACK_TYPE(stack, i, op_type, 1);

Original file line number	Diff line number	Diff line change
`@@ -6902,7 +6902,7 @@ static const void zend_jit_trace(zend_jit_trace_rec trace_buffer, uint32_t par`
`6902`	`6902`
`6903`	`6903`	`ssa->var_info[j].type &= ~MAY_BE_GUARD;`
`6904`	`6904`	`op_type = concrete_type(ssa->var_info[j].type);`
`6905`		`- if (!zend_jit_type_guard(&ctx, opline, EX_NUM_TO_VAR(i), op_type)) {`
	`6905`	`+ if (!zend_jit_type_guard(&ctx, NULL, EX_NUM_TO_VAR(i), op_type)) {`
`6906`	`6906`	`goto jit_failure;`
`6907`	`6907`	`}`
`6908`	`6908`	`SET_STACK_TYPE(stack, i, op_type, 1);`