@@ -11825,7 +11825,7 @@ static int zend_jit_fetch_obj(dasm_State **Dst,
11825
11825
}
11826
11826
}
11827
11827
| add TMP1, FCARG1x, REG0
11828
- | ldr REG2w, [TMP1, #offsetof(zval,u1.type_info )]
11828
+ | ldrb REG2w, [TMP1, #offsetof(zval,u1.v.type )]
11829
11829
| IF_UNDEF REG2w, >5
11830
11830
| mov FCARG1x, TMP1
11831
11831
prop_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FCARG1x, 0);
@@ -11868,7 +11868,7 @@ static int zend_jit_fetch_obj(dasm_State **Dst,
11868
11868
}
11869
11869
} else {
11870
11870
prop_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FCARG1x, prop_info->offset);
11871
- | MEM_ACCESS_32_WITH_UOFFSET ldr , REG2w, FCARG1x, (prop_info->offset + offsetof(zval,u1.type_info )), TMP1
11871
+ | MEM_ACCESS_8_WITH_UOFFSET ldrb , REG2w, FCARG1x, (prop_info->offset + offsetof(zval,u1.v.type )), TMP1
11872
11872
if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) {
11873
11873
if (opline->opcode == ZEND_FETCH_OBJ_W || !(res_info & MAY_BE_GUARD) || !JIT_G(current_frame)) {
11874
11874
/* perform IS_UNDEF check only after result type guard (during deoptimization) */
@@ -11919,8 +11919,7 @@ static int zend_jit_fetch_obj(dasm_State **Dst,
11919
11919
|.code
11920
11920
}
11921
11921
} else if (flags == ZEND_FETCH_REF) {
11922
- | GET_LOW_8BITS TMP1w, REG2w
11923
- | IF_TYPE TMP1w, IS_REFERENCE, >1
11922
+ | IF_TYPE REG2w, IS_REFERENCE, >1
11924
11923
if (ce && ce->ce_flags & ZEND_ACC_IMMUTABLE) {
11925
11924
| LOAD_ADDR FCARG2x, prop_info
11926
11925
} else {
0 commit comments