From b22acafd6624579ef3b59ec4a8f1f78870d61cea Mon Sep 17 00:00:00 2001
From: Bob Weinand <bobwei9@hotmail.com>
Date: Wed, 10 Apr 2024 02:02:55 +0200
Subject: [PATCH] Fix exception IP in JIT

---
 ext/opcache/jit/zend_jit_arm64.dasc | 3 ++-
 ext/opcache/jit/zend_jit_x86.dasc   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc
index 37fca7cfeb60a..910105aa5bbff 100644
--- a/ext/opcache/jit/zend_jit_arm64.dasc
+++ b/ext/opcache/jit/zend_jit_arm64.dasc
@@ -688,7 +688,7 @@ static bool logical_immediate_p(uint64_t value, uint32_t reg_size)
 |	.if ZTS
 ||		if (GCC_GLOBAL_REGS) {
 |			LOAD_TSRM_CACHE IP
-|	   		MEM_ACCESS_64_WITH_UOFFSET ldr, IP, IP, (struct.._offset+offsetof(zend_..struct, field)), tmp_reg
+|	   		ADD_SUB_64_WITH_CONST_32 add, IP, IP, (struct.._offset+offsetof(zend_..struct, field)), tmp_reg
 ||		} else {
 |			LOAD_TSRM_CACHE RX
 |			ADD_SUB_64_WITH_CONST_32 add, RX, RX, (struct.._offset+offsetof(zend_..struct, field)), tmp_reg
@@ -1935,6 +1935,7 @@ static int zend_jit_leave_throw_stub(dasm_State **Dst)
 		|5:
 		|	// opline = EG(exception_op);
 		|	LOAD_IP_ADDR_ZTS executor_globals, exception_op, TMP2
+		|	str IP, EX->opline
 		|	// HANDLE_EXCEPTION()
 		|	b ->exception_handler
 	} else {
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
index 7ae69c9fb657e..d083bf47c76d9 100644
--- a/ext/opcache/jit/zend_jit_x86.dasc
+++ b/ext/opcache/jit/zend_jit_x86.dasc
@@ -406,7 +406,7 @@ static size_t tsrm_tls_offset;
 |	.if ZTS
 ||		if (GCC_GLOBAL_REGS) {
 |			LOAD_TSRM_CACHE IP
-|			mov IP, aword [IP + (struct.._offset + offsetof(zend_..struct, field))]
+|			lea IP, aword [IP + (struct.._offset + offsetof(zend_..struct, field))]
 ||		} else {
 |			LOAD_TSRM_CACHE RX
 |			lea RX, aword [RX + (struct.._offset + offsetof(zend_..struct, field))]
@@ -1884,6 +1884,7 @@ static int zend_jit_leave_throw_stub(dasm_State **Dst)
 		|5:
 		|	// opline = EG(exception_op);
 		|	LOAD_IP_ADDR_ZTS executor_globals, exception_op
+		|	mov aword EX->opline, IP
 		|	// HANDLE_EXCEPTION()
 		|	jmp ->exception_handler
 	} else {