Always load EX(opline) into the current frame in JIT when observers are enabled

Fixes #13772.

Author: bwoebi

ext/opcache/jit/zend_jit_arm64.dasc

@@ -9338,7 +9338,7 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 			}
 
 			if (call_num_args <= func->op_array.num_args) {
-				if (!trace || (trace->op == ZEND_JIT_TRACE_END
+				if (!trace || ZEND_OBSERVER_ENABLED || (trace->op == ZEND_JIT_TRACE_END
 				 && trace->stop == ZEND_JIT_TRACE_STOP_INTERPRETER)) {
 					uint32_t num_args;
 
@@ -9389,7 +9389,7 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 					}
 				}
 			} else {
-				if (!trace || (trace->op == ZEND_JIT_TRACE_END
+				if (!trace || ZEND_OBSERVER_ENABLED || (trace->op == ZEND_JIT_TRACE_END
 				 && trace->stop == ZEND_JIT_TRACE_STOP_INTERPRETER)) {
 					if (func && zend_accel_in_shm(func->op_array.opcodes)) {
 						|	LOAD_IP_ADDR (func->op_array.opcodes)

ext/opcache/jit/zend_jit_x86.dasc

@@ -10074,7 +10074,7 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 			}
 
 			if (call_num_args <= func->op_array.num_args) {
-				if (!trace || (trace->op == ZEND_JIT_TRACE_END
+				if (!trace || ZEND_OBSERVER_ENABLED || (trace->op == ZEND_JIT_TRACE_END
 				 && trace->stop == ZEND_JIT_TRACE_STOP_INTERPRETER)) {
 					uint32_t num_args;
 
@@ -10129,7 +10129,7 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 					}
 				}
 			} else {
-				if (!trace || (trace->op == ZEND_JIT_TRACE_END
+				if (!trace || ZEND_OBSERVER_ENABLED || (trace->op == ZEND_JIT_TRACE_END
 				 && trace->stop == ZEND_JIT_TRACE_STOP_INTERPRETER)) {
 					if (func && zend_accel_in_shm(func->op_array.opcodes)) {
 						|	LOAD_IP_ADDR (func->op_array.opcodes)

ext/opcache/tests/jit/gh13772.phpt

@@ -0,0 +1,26 @@
+--TEST--
+EX(opline) is correctly set for nested JIT user code calls
+--EXTENSIONS--
+opcache
+zend_test
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+zend_test.observer.enabled=1
+zend_test.observer.observe_all=1
+zend_test.observer.show_output=0
+--FILE--
+<?php
+
+function Ack($m, $n) {
+	if ($m == 0) return $n+1;
+	if ($n == 0) return Ack($m-1, 1);
+	return Ack($m - 1, Ack($m, ($n - 1)));
+}
+
+var_dump(Ack(3, 3));
+
+?>
+--EXPECT--
+int(61)
+

ext/zend_test/observer.c

@@ -69,6 +69,9 @@ static void observer_show_opcode(zend_execute_data *execute_data)
 
 static void observer_begin(zend_execute_data *execute_data)
 {
+	ZEND_ASSERT(!ZEND_USER_CODE(EX(func)->type) ||
+		(EX(opline) >= EX(func)->op_array.opcodes && EX(opline) < EX(func)->op_array.opcodes + EX(func)->op_array.last));
+
 	if (!ZT_G(observer_show_output)) {
 		return;
 	}