diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-01 22:13:59 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-01 22:16:56 +0200 |
| commit | 27ad0efb58af8cc89ac5b02786529a2bd3ed1d0c (patch) | |
| tree | a82ed0d9b3c054a13c04878eb867d668f67b508a | |
| parent | 646dc190485d6a0e34090a39a3504252248a3632 (diff) | |
| download | php-git-27ad0efb58af8cc89ac5b02786529a2bd3ed1d0c.tar.gz | |
Revert "Save opline before fallible arg type check in recv_init jit"
This reverts commit b09bddcaa5d6af94f0b94b324c1f52045c909d5e.
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.
| -rw-r--r-- | ext/opcache/jit/zend_jit_x86.dasc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index fb0b1ad909..5bda3f5980 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -9100,7 +9100,6 @@ static int zend_jit_recv_init(dasm_State **Dst, const zend_op *opline, zend_op_a } else { | cmp byte [r0 + 8], IS_OBJECT | jne >8 - | SAVE_VALID_OPLINE opline | mov FCARG1a, r0 | mov r0, EX->run_time_cache | 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 } if (has_slow & 2) { |8: - | SAVE_VALID_OPLINE opline | mov FCARG1a, r0 | mov r0, EX->run_time_cache | lea r0, [r0 + opline->extended_value] |