Skip to content

Commit 6f54b17

Browse files
committed
Fixed condition
1 parent 7879544 commit 6f54b17

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ext/opcache/jit/zend_jit_arm64.dasc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5117,7 +5117,7 @@ static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_o
51175117
if (packed_loaded) {
51185118
| IF_NOT_Z_TYPE REG0, IS_UNDEF, >8, TMP1w
51195119
}
5120-
if (!(op1_info & MAY_BE_ARRAY_KEY_LONG) || (op1_info & MAY_BE_ARRAY_NUMERIC_HASH) || packed_loaded) {
5120+
if (!(op1_info & MAY_BE_ARRAY_KEY_LONG) || (op1_info & MAY_BE_ARRAY_NUMERIC_HASH) || packed_loaded || dim_type == IS_UNDEF) {
51215121
|2:
51225122
|4:
51235123
if (!op2_loaded) {

ext/opcache/jit/zend_jit_x86.dasc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5584,15 +5584,15 @@ static int zend_jit_fetch_dimension_address_inner(dasm_State **Dst, const zend_o
55845584
if (packed_loaded) {
55855585
| IF_NOT_Z_TYPE r0, IS_UNDEF, >8
55865586
}
5587-
// if (!(op1_info & MAY_BE_ARRAY_KEY_LONG) || (op1_info & MAY_BE_ARRAY_NUMERIC_HASH) || packed_loaded) {
5587+
if (!(op1_info & MAY_BE_ARRAY_KEY_LONG) || (op1_info & MAY_BE_ARRAY_NUMERIC_HASH) || packed_loaded || dim_type == IS_UNDEF) {
55885588
|2:
55895589
|4:
55905590
if (!op2_loaded) {
55915591
| // hval = Z_LVAL_P(dim);
55925592
| GET_ZVAL_LVAL ZREG_FCARG2, op2_addr
55935593
}
55945594
| EXT_CALL zend_hash_index_lookup, r0
5595-
// }
5595+
}
55965596
break;
55975597
default:
55985598
ZEND_UNREACHABLE();

0 commit comments

Comments
 (0)