Force reload execute_data when returning from exception

Author: arnaud-lb

Zend/zend_vm_gen.php

@@ -2175,7 +2175,7 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name)
                                 "# endif\n" .
                                 $m[1]."return;\n" .
                                 "#else\n" .
-                                $m[1]."if (EXPECTED(opline != NULL)) {\n" .
+                                $m[1]."if (EXPECTED(opline != NULL && (uintptr_t)opline != (1ULL<<63))) {\n" .
                                 $m[1]."\topline = (zend_op*)((uintptr_t)opline & ~(1ULL<<63));\n".
                                 $m[1]."\texecute_data = EG(current_execute_data);\n".
                                 $m[1]."\tZEND_VM_LOOP_INTERRUPT_CHECK();\n".

ext/opcache/jit/zend_jit_ir.c

@@ -1890,6 +1890,18 @@ static void zend_jit_check_timeout(zend_jit_ctx *jit, const zend_op *opline, con
 	}
 }
 
+static void zend_jit_vm_enter(zend_jit_ctx *jit, ir_ref to_opline)
+{
+	// ZEND_VM_ENTER()
+	ir_RETURN(ir_OR_A(to_opline, ir_CONST_ADDR((uintptr_t)1ULL<<63)));
+}
+
+static void zend_jit_vm_leave(zend_jit_ctx *jit, ir_ref to_opline)
+{
+	// ZEND_VM_LEAVE()
+	ir_RETURN(ir_OR_A(to_opline, ir_CONST_ADDR((uintptr_t)1ULL<<63)));
+}
+
 /* stubs */
 
 static int zend_jit_exception_handler_stub(zend_jit_ctx *jit)
@@ -1902,15 +1914,13 @@ static int zend_jit_exception_handler_stub(zend_jit_ctx *jit)
 		ir_CALL(IR_VOID, ir_CONST_FUNC(handler));
 		ir_TAILCALL(IR_VOID, ir_LOAD_A(jit_IP(jit)));
 	} else {
-		// TODO: zend_get_opcode_handler_func
 		handler = EG(exception_op)->handler;
 
 		if (GCC_GLOBAL_REGS) {
 			ir_TAILCALL(IR_VOID, ir_CONST_FUNC(handler));
 		} else {
-			// TODO: tail call?
 			ir_ref ref = ir_CALL_2(IR_ADDR, ir_CONST_FC_FUNC(handler), jit_FP(jit), jit_IP(jit));
-			ir_RETURN(ref);
+			zend_jit_vm_enter(jit, ref);
 		}
 	}
 	return 1;
@@ -1984,16 +1994,6 @@ static int zend_jit_exception_handler_free_op2_stub(zend_jit_ctx *jit)
 	return 1;
 }
 
-static void zend_jit_vm_enter(zend_jit_ctx *jit, ir_ref to_opline)
-{
-	ir_RETURN(ir_OR_A(to_opline, ir_CONST_ADDR((uintptr_t)1ULL<<63)));
-}
-
-static void zend_jit_vm_leave(zend_jit_ctx *jit, ir_ref to_opline)
-{
-	ir_RETURN(ir_OR_A(to_opline, ir_CONST_ADDR((uintptr_t)1ULL<<63)));
-}
-
 static int zend_jit_interrupt_handler_stub(zend_jit_ctx *jit)
 {
 	ir_ref if_timeout, if_exception;
@@ -17355,7 +17355,7 @@ static int zend_jit_trace_return(zend_jit_ctx *jit, bool original_handler, const
 			  || opline->opcode == ZEND_GENERATOR_CREATE
 			  || opline->opcode == ZEND_YIELD
 			  || opline->opcode == ZEND_YIELD_FROM)) {
-				ir_RETURN(ref);
+				zend_jit_vm_enter(jit, ref);
 				return 1;
 			}
 		}