Skip to content

Commit e4ac2cc

Browse files
committed
Fixed code review issues
1 parent 5db9d1d commit e4ac2cc

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

ext/opcache/jit/zend_jit_ir.c

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7916,9 +7916,6 @@ static int zend_jit_isset_isempty_cv(zend_jit_ctx *jit, const zend_op *opline, u
79167916
} else {
79177917
ir_GUARD(ref, ir_CONST_ADDR(exit_addr));
79187918
}
7919-
if (end_inputs) {
7920-
ir_END_list(end_inputs);
7921-
}
79227919
} else if (smart_branch_opcode) {
79237920
ir_ref if_val = ir_IF(ref);
79247921
ir_IF_TRUE(if_val);
@@ -11508,7 +11505,7 @@ static int zend_jit_fetch_dimension_address_inner(zend_jit_ctx *jit,
1150811505
ir_IF_FALSE(if_packed);
1150911506
if_packed = IR_UNUSED;
1151011507
ir_END_list(idx_not_found_inputs);
11511-
} if (!packed_loaded) {
11508+
} else if (!packed_loaded) {
1151211509
ir_END_list(idx_not_found_inputs);
1151311510
}
1151411511

@@ -11524,11 +11521,7 @@ static int zend_jit_fetch_dimension_address_inner(zend_jit_ctx *jit,
1152411521
ref = ir_CALL_2(IR_ADDR, ir_CONST_FC_FUNC(zend_jit_hash_index_lookup_rw), ht_ref, h);
1152511522
}
1152611523
if (not_found_exit_addr) {
11527-
if (packed_loaded) {
11528-
ir_GUARD(ref, ir_CONST_ADDR(not_found_exit_addr));
11529-
} else {
11530-
ir_GUARD(ref, ir_CONST_ADDR(not_found_exit_addr));
11531-
}
11524+
ir_GUARD(ref, ir_CONST_ADDR(not_found_exit_addr));
1153211525
} else {
1153311526
if_found = ir_IF(ref);
1153411527
ir_IF_FALSE(if_found);
@@ -14453,7 +14446,6 @@ static int zend_jit_assign_obj_op(zend_jit_ctx *jit,
1445314446
case ZEND_BW_OR:
1445414447
case ZEND_BW_AND:
1445514448
case ZEND_BW_XOR:
14456-
may_throw = 1;
1445714449
if ((var_info & (MAY_BE_STRING|MAY_BE_DOUBLE|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE)) ||
1445814450
(val_info & (MAY_BE_STRING|MAY_BE_DOUBLE|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE))) {
1445914451
if ((var_info & MAY_BE_ANY) != MAY_BE_STRING ||

0 commit comments

Comments
 (0)