Always use return address

Author: segrax

ext/opcache/jit/zend_jit_arm64.dasc

@@ -10936,7 +10936,15 @@ static int zend_jit_return(dasm_State **Dst, const zend_op *opline, const zend_o
 	}
 
 	if (return_value_used == 0) {
-		/* pass */
+		if (ZEND_OBSERVER_ENABLED && Z_MODE(op1_addr) == IS_REG) {
+			zend_jit_addr dst = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->op1.var);
+
+			if (!zend_jit_spill_store(Dst, op1_addr, dst, op1_info, 1)) {
+				return 0;
+			}
+			op1_addr = dst;
+		}
+		ret_addr = op1_addr;
 	} else if (opline->op1_type == IS_CONST) {
 		zval *zv = RT_CONSTANT(opline, opline->op1);
 		|	ZVAL_COPY_CONST ret_addr, MAY_BE_ANY, MAY_BE_ANY, zv, ZREG_REG0, ZREG_TMP1, ZREG_FPR0
@@ -11005,14 +11013,6 @@ static int zend_jit_return(dasm_State **Dst, const zend_op *opline, const zend_o
 
 	|9:
 	if (ZEND_OBSERVER_ENABLED) {
-		if (Z_MODE(op1_addr) == IS_REG) {
-			zend_jit_addr dst = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->op1.var);
-
-			if (!zend_jit_spill_store(Dst, op1_addr, dst, op1_info, 1)) {
-				return 0;
-			}
-			op1_addr = dst;
-		}
 		|	LOAD_ZVAL_ADDR FCARG2x, op1_addr
 		|	mov FCARG1x, FP
 		|	SET_EX_OPLINE opline, REG0

ext/opcache/jit/zend_jit_x86.dasc

@@ -11649,7 +11649,15 @@ static int zend_jit_return(dasm_State **Dst, const zend_op *opline, const zend_o
 	}
 
 	if (return_value_used == 0) {
-		/* pass */
+		if (ZEND_OBSERVER_ENABLED && Z_MODE(op1_addr) == IS_REG) {
+			zend_jit_addr dst = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->op1.var);
+
+			if (!zend_jit_spill_store(Dst, op1_addr, dst, op1_info, 1)) {
+				return 0;
+			}
+			op1_addr = dst;
+		}
+		ret_addr = op1_addr;
 	} else if (opline->op1_type == IS_CONST) {
 		zval *zv = RT_CONSTANT(opline, opline->op1);
 		|	ZVAL_COPY_CONST ret_addr, MAY_BE_ANY, MAY_BE_ANY, zv, ZREG_R0
@@ -11717,14 +11725,6 @@ static int zend_jit_return(dasm_State **Dst, const zend_op *opline, const zend_o
 
 	|9:
 	if (ZEND_OBSERVER_ENABLED) {
-		if (Z_MODE(op1_addr) == IS_REG) {
-			zend_jit_addr dst = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->op1.var);
-
-			if (!zend_jit_spill_store(Dst, op1_addr, dst, op1_info, 1)) {
-				return 0;
-			}
-			op1_addr = dst;
-		}
 		|	LOAD_ZVAL_ADDR FCARG2a, op1_addr
 		|	mov FCARG1a, FP
 		|	SET_EX_OPLINE opline, r0