Skip to content

Commit 27ad0ef

Browse files
committed
Revert "Save opline before fallible arg type check in recv_init jit"
This reverts commit b09bddc. This causes test failures on macos -- presumably the relevant difference is that it has no global regs. I suspect that this is related to the fact that SAVE_VALID_OPLINE may use r0 as a scratch register, which is already in use. Reverting for now.
1 parent 646dc19 commit 27ad0ef

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9100,7 +9100,6 @@ static int zend_jit_recv_init(dasm_State **Dst, const zend_op *opline, zend_op_a
91009100
} else {
91019101
| cmp byte [r0 + 8], IS_OBJECT
91029102
| jne >8
9103-
| SAVE_VALID_OPLINE opline
91049103
| mov FCARG1a, r0
91059104
| mov r0, EX->run_time_cache
91069105
| lea r0, [r0 + opline->extended_value]
@@ -9152,7 +9151,6 @@ static int zend_jit_recv_init(dasm_State **Dst, const zend_op *opline, zend_op_a
91529151
}
91539152
if (has_slow & 2) {
91549153
|8:
9155-
| SAVE_VALID_OPLINE opline
91569154
| mov FCARG1a, r0
91579155
| mov r0, EX->run_time_cache
91589156
| lea r0, [r0 + opline->extended_value]

0 commit comments

Comments
 (0)