Skip to content

Commit 17d763f

Browse files
committed
JIT: Save opline before calling zend_timeout
tests/045.phpt started segfaulting, because the opline is not set when zend_timeout is invoked.
1 parent 38ecfe0 commit 17d763f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1606,6 +1606,7 @@ static inline zend_bool is_signed(double d)
16061606
static int zend_jit_interrupt_handler_stub(dasm_State **Dst)
16071607
{
16081608
|->interrupt_handler:
1609+
| SAVE_OPLINE
16091610
| //EG(vm_interrupt) = 0;
16101611
| MEM_OP2_1_ZTS mov, byte, executor_globals, vm_interrupt, 0, r0
16111612
| //if (EG(timed_out)) {
@@ -1617,7 +1618,6 @@ static int zend_jit_interrupt_handler_stub(dasm_State **Dst)
16171618
|1:
16181619
| //} else if (zend_interrupt_function) {
16191620
if (zend_interrupt_function) {
1620-
| SAVE_OPLINE
16211621
| //zend_interrupt_function(execute_data);
16221622
|.if X64
16231623
| mov CARG1, FP

0 commit comments

Comments
 (0)