Fix zend_jit_leave_func

arnaud-lb · arnaud-lb · commit a7a44f4f0dd4 · 2025-03-14T17:30:43.000+01:00
diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c
@@ -11091,7 +11091,12 @@ static int zend_jit_leave_func(zend_jit_ctx         *jit,
 				} else if (GCC_GLOBAL_REGS) {
 					ir_GUARD(jit_IP(jit), jit_STUB_ADDR(jit, jit_stub_trace_halt));
 				} else {
-					ir_GUARD(ir_LT(ref, ir_CONST_I32(0)), jit_STUB_ADDR(jit, jit_stub_trace_halt));
+#ifdef ZEND_HIGH_HALF_KERNEL
+					ir_GUARD(ir_AND_A(ref, ir_CONST_ADDR(~ZEND_VM_ENTER_BIT)), jit_STUB_ADDR(jit, jit_stub_trace_halt));
+#else
+					ir_GUARD(ir_EQ_A(ref, ir_CONST_ADDR(ZEND_VM_RETURN_VAL)), jit_STUB_ADDR(jit, jit_stub_trace_halt));
+#endif
+					jit_STORE_IP(jit, ref);
 				}
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -11091,7 +11091,12 @@ static int zend_jit_leave_func(zend_jit_ctx *jit,`
`11091`	`11091`	`} else if (GCC_GLOBAL_REGS) {`
`11092`	`11092`	`ir_GUARD(jit_IP(jit), jit_STUB_ADDR(jit, jit_stub_trace_halt));`
`11093`	`11093`	`} else {`
`11094`		`- ir_GUARD(ir_LT(ref, ir_CONST_I32(0)), jit_STUB_ADDR(jit, jit_stub_trace_halt));`
	`11094`	`+#ifdef ZEND_HIGH_HALF_KERNEL`
	`11095`	`+ ir_GUARD(ir_AND_A(ref, ir_CONST_ADDR(~ZEND_VM_ENTER_BIT)), jit_STUB_ADDR(jit, jit_stub_trace_halt));`
	`11096`	`+#else`
	`11097`	`+ ir_GUARD(ir_EQ_A(ref, ir_CONST_ADDR(ZEND_VM_RETURN_VAL)), jit_STUB_ADDR(jit, jit_stub_trace_halt));`
	`11098`	`+#endif`
	`11099`	`+ jit_STORE_IP(jit, ref);`
`11095`	`11100`	`}`
`11096`	`11101`	`}`
`11097`	`11102`