Skip to content

Commit 9a4b5c6

Browse files
dstogovdstogov
committed
Replace ZEND_ASSERT(0) by ZEND_UNREACHABLE()
1 parent c6cfd72 commit 9a4b5c6

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎ext/opcache/jit/zend_jit_ir.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ static ir_ref jit_ZVAL_ADDR(zend_jit_ctx *jit, zend_jit_addr addr)
10421042
} else if (Z_REG(addr) == ZREG_RX) {
10431043
reg = jit_IP(jit);
10441044
} else {
1045-
ZEND_ASSERT(0);
1045+
ZEND_UNREACHABLE();
10461046
}
10471047
return ir_ADD_OFFSET(reg, Z_OFFSET(addr));
10481048
} else if (Z_MODE(addr) == IS_REF_ZVAL) {
@@ -1071,7 +1071,7 @@ static ir_ref jit_Z_TYPE(zend_jit_ctx *jit, zend_jit_addr addr)
10711071
} else if (Z_REG(addr) == ZREG_RX) {
10721072
reg = jit_IP(jit);
10731073
} else {
1074-
ZEND_ASSERT(0);
1074+
ZEND_UNREACHABLE();
10751075
}
10761076
return ir_LOAD_U8(ir_ADD_OFFSET(reg, Z_OFFSET(addr) + offsetof(zval, u1.v.type)));
10771077
} else {
@@ -1097,7 +1097,7 @@ static ir_ref jit_Z_TYPE_FLAGS(zend_jit_ctx *jit, zend_jit_addr addr)
10971097
} else if (Z_REG(addr) == ZREG_RX) {
10981098
reg = jit_IP(jit);
10991099
} else {
1100-
ZEND_ASSERT(0);
1100+
ZEND_UNREACHABLE();
11011101
}
11021102
return ir_LOAD_U8(ir_ADD_OFFSET(reg, Z_OFFSET(addr) + offsetof(zval, u1.v.type_flags)));
11031103
} else {
@@ -1123,7 +1123,7 @@ static ir_ref jit_Z_TYPE_INFO(zend_jit_ctx *jit, zend_jit_addr addr)
11231123
} else if (Z_REG(addr) == ZREG_RX) {
11241124
reg = jit_IP(jit);
11251125
} else {
1126-
ZEND_ASSERT(0);
1126+
ZEND_UNREACHABLE();
11271127
}
11281128
return ir_LOAD_U32(ir_ADD_OFFSET(reg, Z_OFFSET(addr) + offsetof(zval, u1.type_info)));
11291129
} else {
@@ -1147,7 +1147,7 @@ static void jit_set_Z_TYPE_INFO_ex(zend_jit_ctx *jit, zend_jit_addr addr, ir_ref
11471147
} else if (Z_REG(addr) == ZREG_RX) {
11481148
reg = jit_IP(jit);
11491149
} else {
1150-
ZEND_ASSERT(0);
1150+
ZEND_UNREACHABLE();
11511151
}
11521152
ir_STORE(ir_ADD_OFFSET(reg, Z_OFFSET(addr) + offsetof(zval, u1.type_info)), type_info);
11531153
} else {
@@ -1330,7 +1330,7 @@ static ir_ref zend_jit_use_reg(zend_jit_ctx *jit, zend_jit_addr addr)
13301330
} else if ((jit->ssa->var_info[var].type & MAY_BE_ANY) == MAY_BE_DOUBLE) {
13311331
ref = jit_Z_DVAL_ref(jit, jit_ZVAL_ADDR(jit, mem_addr));
13321332
} else {
1333-
ZEND_ASSERT(0);
1333+
ZEND_UNREACHABLE();
13341334
}
13351335
zend_jit_def_reg(jit, addr, ref);
13361336
return ref;
@@ -3419,15 +3419,15 @@ static void _zend_jit_add_predecessor_ref(zend_jit_ctx *jit, int b, int pred, ir
34193419
ir_BEGIN(ref);
34203420
ref = ir_LOOP_END();
34213421
} else {
3422-
ZEND_ASSERT(0);
3422+
ZEND_UNREACHABLE();
34233423
}
34243424
ir_MERGE_SET_OP(header, i + 1, ref);
34253425
}
34263426
*r = ref;
34273427
return;
34283428
}
34293429
}
3430-
ZEND_ASSERT(0);
3430+
ZEND_UNREACHABLE();
34313431
}
34323432

34333433
static void _zend_jit_merge_smart_branch_inputs(zend_jit_ctx *jit,
@@ -3601,7 +3601,7 @@ static void zend_jit_case_start(zend_jit_ctx *jit, int switch_b, int case_b, ir_
36013601
ir_MERGE_list(list);
36023602
}
36033603
} else {
3604-
ZEND_ASSERT(0);
3604+
ZEND_UNREACHABLE();
36053605
}
36063606
}
36073607

@@ -4749,7 +4749,7 @@ static int zend_jit_math_long_long(zend_jit_ctx *jit,
47494749
} else if (opcode == ZEND_MUL) {
47504750
op = may_overflow ? IR_MUL_OV : IR_MUL;
47514751
} else {
4752-
ZEND_ASSERT(0);
4752+
ZEND_UNREACHABLE();
47534753
}
47544754
op1 = jit_Z_LVAL(jit, op1_addr);
47554755
op2 = (same_ops) ? op1 : jit_Z_LVAL(jit, op2_addr);
@@ -4864,7 +4864,7 @@ static int zend_jit_math_long_long(zend_jit_ctx *jit,
48644864
} else if (opcode == ZEND_MUL) {
48654865
op = IR_MUL;
48664866
} else {
4867-
ZEND_ASSERT(0);
4867+
ZEND_UNREACHABLE();
48684868
}
48694869
#if 1
48704870
/* reload */
@@ -4913,7 +4913,7 @@ static int zend_jit_math_long_double(zend_jit_ctx *jit,
49134913
} else if (opcode == ZEND_DIV) {
49144914
op = IR_DIV;
49154915
} else {
4916-
ZEND_ASSERT(0);
4916+
ZEND_UNREACHABLE();
49174917
}
49184918
op1 = jit_Z_LVAL(jit, op1_addr);
49194919
op2 = jit_Z_DVAL(jit, op2_addr);
@@ -4947,7 +4947,7 @@ static int zend_jit_math_double_long(zend_jit_ctx *jit,
49474947
} else if (opcode == ZEND_DIV) {
49484948
op = IR_DIV;
49494949
} else {
4950-
ZEND_ASSERT(0);
4950+
ZEND_UNREACHABLE();
49514951
}
49524952
op1 = jit_Z_DVAL(jit, op1_addr);
49534953
op2 = jit_Z_LVAL(jit, op2_addr);
@@ -4984,7 +4984,7 @@ static int zend_jit_math_double_double(zend_jit_ctx *jit,
49844984
} else if (opcode == ZEND_DIV) {
49854985
op = IR_DIV;
49864986
} else {
4987-
ZEND_ASSERT(0);
4987+
ZEND_UNREACHABLE();
49884988
}
49894989
op1 = jit_Z_DVAL(jit, op1_addr);
49904990
op2 = (same_ops) ? op1 : jit_Z_DVAL(jit, op2_addr);
@@ -5514,7 +5514,7 @@ static int zend_jit_long_math_helper(zend_jit_ctx *jit,
55145514
} else if (opcode == ZEND_BW_XOR) {
55155515
op = IR_XOR;
55165516
} else {
5517-
ZEND_ASSERT(0);
5517+
ZEND_UNREACHABLE();
55185518
}
55195519
op1 = jit_Z_LVAL(jit, op1_addr);
55205520
op2 = (same_ops) ? op1 : jit_Z_LVAL(jit, op2_addr);
@@ -6397,7 +6397,7 @@ static int zend_jit_assign(zend_jit_ctx *jit,
63976397
} else if ((op1_def_info & MAY_BE_ANY) == MAY_BE_DOUBLE) {
63986398
jit_set_Z_TYPE_INFO(jit, op1_use_addr, IS_DOUBLE);
63996399
} else {
6400-
ZEND_ASSERT(0);
6400+
ZEND_UNREACHABLE();
64016401
}
64026402
}
64036403
}
@@ -12637,7 +12637,7 @@ static int zend_jit_isset_isempty_dim(zend_jit_ctx *jit,
1263712637
ir_END_list(end_inputs);
1263812638
}
1263912639
} else {
12640-
ZEND_ASSERT(0); // TODO: support for empty()
12640+
ZEND_UNREACHABLE(); // TODO: support for empty()
1264112641
}
1264212642
}
1264312643

@@ -12669,7 +12669,7 @@ static int zend_jit_isset_isempty_dim(zend_jit_ctx *jit,
1266912669
ir_END_list(end_inputs);
1267012670
}
1267112671
} else {
12672-
ZEND_ASSERT(0); // TODO: support for empty()
12672+
ZEND_UNREACHABLE(); // TODO: support for empty()
1267312673
}
1267412674

1267512675
if (!exit_addr && smart_branch_opcode) {
@@ -13357,7 +13357,7 @@ static int zend_jit_fe_fetch(zend_jit_ctx *jit, const zend_op *opline, uint32_t
1335713357
pos_ref = packed_pos_ref;
1335813358
p_ref = packed_p_ref;
1335913359
} else {
13360-
ZEND_ASSERT(0);
13360+
ZEND_UNREACHABLE();
1336113361
}
1336213362

1336313363
// JIT: Z_FE_POS_P(array) = pos + 1;
@@ -16172,7 +16172,7 @@ static int zend_jit_trace_start(zend_jit_ctx *jit,
1617216172
} else if (STACK_TYPE(parent_stack, i) == IS_DOUBLE) {
1617316173
type = IR_DOUBLE;
1617416174
} else {
16175-
ZEND_ASSERT(0);
16175+
ZEND_UNREACHABLE();
1617616176
}
1617716177
if (ssa && ssa->vars[i].no_val) {
1617816178
/* pass */

‎ext/opcache/jit/zend_jit_trace.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3978,7 +3978,7 @@ static int zend_jit_trace_deoptimization(
39783978
return 0;
39793979
}
39803980
} else {
3981-
ZEND_ASSERT(0);
3981+
ZEND_UNREACHABLE();
39823982
}
39833983
if (stack) {
39843984
SET_STACK_TYPE(stack, i, type, 1);
@@ -8500,7 +8500,7 @@ static void zend_jit_dump_exit_info(zend_jit_trace_info *t)
85008500
} else if (type == IS_DOUBLE) {
85018501
fprintf(stderr, "(%g)", t->constants[STACK_REF(stack, j)].d);
85028502
} else {
8503-
ZEND_ASSERT(0);
8503+
ZEND_UNREACHABLE();
85048504
}
85058505
} else if (STACK_FLAGS(stack, j) == ZREG_TYPE_ONLY) {
85068506
fprintf(stderr, "(type_only)");

0 commit comments

Comments
 (0)