Fixed ARM JIT failure introduced in d4ed6b6

dstogov · dstogov · commit 487eface861c · 2021-09-07T17:18:35.000+03:00
diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc
@@ -8479,6 +8479,8 @@ static int zend_jit_init_fcall(dasm_State **Dst, const zend_op *opline, uint32_t
 			} else {
 				ZEND_UNREACHABLE();
 			}
+			|	// Get the return value of function zend_jit_find_func_helper/zend_jit_find_ns_func_helper
+			|	mov REG0, RETVALx
 			if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) {
 				int32_t exit_point = zend_jit_trace_get_exit_point(opline, 0);
 				const void *exit_addr = zend_jit_trace_get_exit_addr(exit_point);

Original file line number	Diff line number	Diff line change
`@@ -8479,6 +8479,8 @@ static int zend_jit_init_fcall(dasm_State *Dst, const zend_op opline, uint32_t`
`8479`	`8479`	`} else {`
`8480`	`8480`	`ZEND_UNREACHABLE();`
`8481`	`8481`	`}`
	`8482`	`+ \| // Get the return value of function zend_jit_find_func_helper/zend_jit_find_ns_func_helper`
	`8483`	`+ \| mov REG0, RETVALx`
`8482`	`8484`	`if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) {`
`8483`	`8485`	`int32_t exit_point = zend_jit_trace_get_exit_point(opline, 0);`
`8484`	`8486`	`const void *exit_addr = zend_jit_trace_get_exit_addr(exit_point);`