Skip to content

Commit 6462297

Browse files
committed
Fixed observer API and JIT compatibility
1 parent 01a3486 commit 6462297

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11432,6 +11432,14 @@ static int zend_jit_return(dasm_State **Dst, const zend_op *opline, const zend_o
1143211432
}
1143311433

1143411434
if (ZEND_OBSERVER_ENABLED) {
11435+
if (Z_MODE(op1_addr) == IS_REG) {
11436+
zend_jit_addr dst = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->op1.var);
11437+
11438+
if (!zend_jit_spill_store(Dst, op1_addr, dst, op1_info, 1)) {
11439+
return 0;
11440+
}
11441+
op1_addr = dst;
11442+
}
1143511443
| LOAD_ZVAL_ADDR FCARG2a, op1_addr
1143611444
| mov FCARG1a, FP
1143711445
| SET_EX_OPLINE opline, r0

0 commit comments

Comments
 (0)