Fix zend_jit_leave_func

Author: arnaud-lb

ext/opcache/jit/zend_jit_internal.h

@@ -201,7 +201,7 @@ extern const zend_op *zend_jit_halt_op;
 		return; \
 	} while(0)
 # define ZEND_VM_ENTER_BIT 0
-#  define ZEND_VM_RETURN_VAL 0
+# define ZEND_VM_RETURN_VAL 0
 #else
 # define EXECUTE_DATA_D                       zend_execute_data* execute_data
 # define EXECUTE_DATA_C                       execute_data

ext/opcache/jit/zend_jit_ir.c

@@ -11091,7 +11091,8 @@ 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));
+					ir_GUARD(ir_NE(ref, ir_CONST_ADDR(ZEND_VM_RETURN_VAL)), jit_STUB_ADDR(jit, jit_stub_trace_halt));
+					jit_LOAD_IP(jit, ref);
 				}
 			}
 

ext/opcache/jit/zend_jit_vm_helpers.c

@@ -105,7 +105,7 @@ ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_leave_top_func_helper(ZEND_OPCODE
 #ifdef HAVE_GCC_GLOBAL_REGS
 	opline = zend_jit_halt_op;
 #else
-	return NULL; // ZEND_VM_RETURN
+	return (const zend_op*)ZEND_VM_RETURN_VAL; // ZEND_VM_RETURN
 #endif
 }
 
@@ -364,15 +364,15 @@ static zend_always_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_trace_c
 			opline = NULL;
 			return;
 #else
-			return NULL; // ZEND_VM_RETURN()
+			return (const zend_op*)ZEND_VM_RETURN_VAL; // ZEND_VM_RETURN()
 #endif
 		}
 		execute_data = EG(current_execute_data);
 		opline = execute_data ? EX(opline) : NULL;
 #ifdef HAVE_GCC_GLOBAL_REGS
 		return;
 #else
-		return opline ? (zend_op*)((uintptr_t)opline | ZEND_VM_ENTER_BIT) : NULL; // ZEND_VM_ENTER() : ZEND_VM_RETURN()
+		return (const zend_op*)((uintptr_t)opline | ZEND_VM_ENTER_BIT); // ZEND_VM_ENTER() / ZEND_VM_RETURN()
 #endif
 	} else {
 		zend_vm_opcode_handler_t handler = (zend_vm_opcode_handler_t)ZEND_OP_TRACE_INFO(opline, offset)->orig_handler;
@@ -942,7 +942,12 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data  *ex,
 		if (UNEXPECTED(execute_data != prev_execute_data)) {
 #else
 		opline = handler(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
+# ifdef ZEND_HIGH_HALF_KERNEL
 		if ((intptr_t)opline <= 0) {
+# else
+		if ((uintptr_t)opline & ZEND_VM_ENTER_BIT) {
+# endif
+			opline = (const zend_op*)((uintptr_t)opline & ~ZEND_VM_ENTER_BIT);
 			if (opline == NULL) {
 				stop = ZEND_JIT_TRACE_STOP_RETURN;
 				opline = NULL;
@@ -952,7 +957,6 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data  *ex,
 				/* return after interrupt handler */
 				ZEND_ASSERT(0 && "TODO");
 			}
-			opline = (zend_op*)((uintptr_t)opline & ~ZEND_VM_ENTER_BIT);
 			execute_data = EG(current_execute_data);
 #endif