Skip to content

Commit 7981d48

Browse files
committed
JIT: Fixed missing type load
1 parent 0015fc9 commit 7981d48

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

ext/opcache/jit/zend_jit_arm64.dasc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12278,9 +12278,7 @@ static int zend_jit_fetch_obj(dasm_State **Dst,
1227812278
| IF_NOT_TYPE TMP1w, IS_REFERENCE, >1
1227912279
| GET_Z_PTR REG0, REG0
1228012280
| add REG0, REG0, #offsetof(zend_reference, val)
12281-
if (type >= IS_STRING) {
12282-
| GET_ZVAL_TYPE_INFO REG2w, val_addr, TMP1
12283-
}
12281+
| GET_ZVAL_TYPE_INFO REG2w, val_addr, TMP1
1228412282
}
1228512283
res_info &= ~MAY_BE_GUARD;
1228612284
ssa->var_info[ssa_op->result_def].type &= ~MAY_BE_GUARD;

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12985,9 +12985,7 @@ static int zend_jit_fetch_obj(dasm_State **Dst,
1298512985
| IF_NOT_TYPE dl, IS_REFERENCE, >1
1298612986
| GET_Z_PTR r0, r0
1298712987
| add r0, offsetof(zend_reference, val)
12988-
if (type >= IS_STRING) {
12989-
| GET_ZVAL_TYPE_INFO edx, val_addr
12990-
}
12988+
| GET_ZVAL_TYPE_INFO edx, val_addr
1299112989
}
1299212990
res_info &= ~MAY_BE_GUARD;
1299312991
ssa->var_info[ssa_op->result_def].type &= ~MAY_BE_GUARD;

0 commit comments

Comments
 (0)