Skip to content

Commit 5dc0b36

Browse files
committed
Fix JIT
1 parent 4562af1 commit 5dc0b36

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10468,7 +10468,7 @@ static int zend_jit_fetch_obj_read(dasm_State **Dst, const zend_op *opline, cons
1046810468
zval *member;
1046910469
uint32_t offset;
1047010470
zend_bool may_be_dynamic = 1;
10471-
zend_jit_addr op1_addr = 0;
10471+
zend_jit_addr op1_addr = 0, orig_op1_addr = 0;
1047210472
zend_jit_addr res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->result.var);
1047310473
zend_jit_addr this_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, offsetof(zend_execute_data, This));
1047410474
zend_jit_addr prop_addr;
@@ -10483,7 +10483,7 @@ static int zend_jit_fetch_obj_read(dasm_State **Dst, const zend_op *opline, cons
1048310483
if (opline->op1_type == IS_UNUSED) {
1048410484
| GET_ZVAL_PTR FCARG1a, this_addr
1048510485
} else {
10486-
op1_addr = OP1_ADDR();
10486+
op1_addr = orig_op1_addr = OP1_ADDR();
1048710487
if (op1_info & MAY_BE_REF) {
1048810488
| LOAD_ZVAL_ADDR r0, op1_addr
1048910489
| ZVAL_DEREF r0, op1_info
@@ -10590,7 +10590,7 @@ static int zend_jit_fetch_obj_read(dasm_State **Dst, const zend_op *opline, cons
1059010590
| EXT_CALL zend_jit_undefined_op_helper, r0
1059110591
|1:
1059210592
}
10593-
| LOAD_ZVAL_ADDR FCARG1a, op1_addr
10593+
| LOAD_ZVAL_ADDR FCARG1a, orig_op1_addr
1059410594
| LOAD_ADDR FCARG2a, Z_STRVAL_P(member)
1059510595
| EXT_CALL zend_jit_invalid_property_read, r0
1059610596
}

0 commit comments

Comments
 (0)