Skip to content

Commit d781f86

Browse files
GirgiasGirgias
committed
Fix [-Wimplicit-fallthrough] warnings in OpCache extension
1 parent 4b7fe7a commit d781f86

File tree

11 files changed

+19
-17
lines changed

11 files changed

+19
-17
lines changed

‎ext/opcache/Optimizer/block_pass.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
399399
Tsource[VAR_NUM(opline->op1.var)] = NULL;
400400
break;
401401
}
402-
/* break missing intentionally */
402+
fallthrough;
403403

404404
case ZEND_IS_EQUAL:
405405
case ZEND_IS_NOT_EQUAL:
@@ -1037,7 +1037,7 @@ static void assemble_code_blocks(zend_cfg *cfg, zend_op_array *op_array, zend_op
10371037
break;
10381038
case ZEND_JMPZNZ:
10391039
opline->extended_value = ZEND_OPLINE_TO_OFFSET(opline, new_opcodes + blocks[b->successors[1]].start);
1040-
/* break missing intentionally */
1040+
fallthrough;
10411041
case ZEND_JMPZ:
10421042
case ZEND_JMPNZ:
10431043
case ZEND_JMPZ_EX:

‎ext/opcache/Optimizer/compact_literals.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
469469
map[i] = l_empty_arr;
470470
break;
471471
}
472-
/* break missing intentionally */
472+
fallthrough;
473473
default:
474474
/* don't merge other types */
475475
map[i] = j;

‎ext/opcache/Optimizer/dfa_pass.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ static void zend_ssa_replace_control_link(zend_op_array *op_array, zend_ssa *ssa
612612
if (ZEND_OFFSET_TO_OPLINE_NUM(op_array, opline, opline->extended_value) == old->start) {
613613
opline->extended_value = ZEND_OPLINE_NUM_TO_OFFSET(op_array, opline, dst->start);
614614
}
615-
/* break missing intentionally */
615+
fallthrough;
616616
case ZEND_JMPZ:
617617
case ZEND_JMPNZ:
618618
case ZEND_JMPZ_EX:

‎ext/opcache/Optimizer/optimize_func_calls.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static void zend_delete_call_instructions(zend_op *opline)
5959
MAKE_NOP(opline);
6060
return;
6161
}
62-
/* break missing intentionally */
62+
fallthrough;
6363
case ZEND_NEW:
6464
case ZEND_INIT_DYNAMIC_CALL:
6565
case ZEND_INIT_USER_CALL:
@@ -178,7 +178,7 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
178178
ctx->script, op_array, opline, &call_stack[call].is_prototype);
179179
call_stack[call].try_inline =
180180
!call_stack[call].is_prototype && opline->opcode != ZEND_NEW;
181-
/* break missing intentionally */
181+
fallthrough;
182182
case ZEND_INIT_DYNAMIC_CALL:
183183
case ZEND_INIT_USER_CALL:
184184
call_stack[call].opline = opline;

‎ext/opcache/Optimizer/sccp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ static inline int ct_eval_assign_dim(zval *result, zval *value, zval *key) {
591591
case IS_NULL:
592592
case IS_FALSE:
593593
array_init(result);
594-
/* break missing intentionally */
594+
fallthrough;
595595
case IS_ARRAY:
596596
case PARTIAL_ARRAY:
597597
return ct_eval_add_array_elem(result, value, key);
@@ -694,7 +694,7 @@ static inline int ct_eval_assign_obj(zval *result, zval *value, zval *key) {
694694
case IS_NULL:
695695
case IS_FALSE:
696696
empty_partial_object(result);
697-
/* break missing intentionally */
697+
fallthrough;
698698
case PARTIAL_OBJECT:
699699
return ct_eval_add_obj_prop(result, value, key);
700700
default:

‎ext/opcache/Optimizer/zend_cfg.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t b
314314
break;
315315
case ZEND_INCLUDE_OR_EVAL:
316316
flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS;
317+
fallthrough;
317318
case ZEND_GENERATOR_CREATE:
318319
case ZEND_YIELD:
319320
case ZEND_YIELD_FROM:

‎ext/opcache/Optimizer/zend_dfg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ static zend_always_inline void _zend_dfg_add_use_def_op(const zend_op_array *op_
195195
if (!zend_bitset_in(def, var_num)) {
196196
zend_bitset_incl(use, var_num);
197197
}
198-
/* break missing intentionally */
198+
fallthrough;
199199
case ZEND_INIT_ARRAY:
200200
if (((build_flags & ZEND_SSA_RC_INFERENCE)
201201
|| (opline->extended_value & ZEND_ARRAY_ELEMENT_REF))

‎ext/opcache/Optimizer/zend_inference.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4415,7 +4415,7 @@ int zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op, const ze
44154415
/* Division by zero */
44164416
return 1;
44174417
}
4418-
/* break missing intentionally */
4418+
fallthrough;
44194419
case ZEND_SUB:
44204420
case ZEND_MUL:
44214421
case ZEND_POW:
@@ -4515,6 +4515,7 @@ int zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op, const ze
45154515
if (t1 & MAY_BE_REF) {
45164516
return 1;
45174517
}
4518+
fallthrough;
45184519
case ZEND_BIND_STATIC:
45194520
case ZEND_UNSET_VAR:
45204521
return (t1 & (MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_ARRAY_OF_OBJECT|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY));

‎ext/opcache/Optimizer/zend_optimizer.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ int zend_optimizer_update_op1_const(zend_op_array *op_array,
325325
if (opline->opcode == ZEND_CONCAT && opline->op2_type == IS_CONST) {
326326
opline->opcode = ZEND_FAST_CONCAT;
327327
}
328-
/* break missing intentionally */
328+
fallthrough;
329329
default:
330330
opline->op1.constant = zend_optimizer_add_literal(op_array, val);
331331
break;
@@ -353,7 +353,7 @@ int zend_optimizer_update_op2_const(zend_op_array *op_array,
353353
(opline + 1)->op2.var == opline->result.var) {
354354
return 0;
355355
}
356-
/* break missing intentionally */
356+
fallthrough;
357357
case ZEND_INSTANCEOF:
358358
REQUIRES_STRING(val);
359359
drop_leading_backslash(val);
@@ -507,7 +507,7 @@ int zend_optimizer_update_op2_const(zend_op_array *op_array,
507507
if (opline->opcode == ZEND_CONCAT && opline->op1_type == IS_CONST) {
508508
opline->opcode = ZEND_FAST_CONCAT;
509509
}
510-
/* break missing intentionally */
510+
fallthrough;
511511
default:
512512
opline->op2.constant = zend_optimizer_add_literal(op_array, val);
513513
break;
@@ -674,7 +674,7 @@ void zend_optimizer_migrate_jump(zend_op_array *op_array, zend_op *new_opline, z
674674
break;
675675
case ZEND_JMPZNZ:
676676
new_opline->extended_value = ZEND_OPLINE_NUM_TO_OFFSET(op_array, new_opline, ZEND_OFFSET_TO_OPLINE_NUM(op_array, opline, opline->extended_value));
677-
/* break missing intentionally */
677+
fallthrough;
678678
case ZEND_JMPZ:
679679
case ZEND_JMPNZ:
680680
case ZEND_JMPZ_EX:
@@ -720,7 +720,7 @@ void zend_optimizer_shift_jump(zend_op_array *op_array, zend_op *opline, uint32_
720720
break;
721721
case ZEND_JMPZNZ:
722722
opline->extended_value = ZEND_OPLINE_NUM_TO_OFFSET(op_array, opline, ZEND_OFFSET_TO_OPLINE_NUM(op_array, opline, opline->extended_value) - shiftlist[ZEND_OFFSET_TO_OPLINE_NUM(op_array, opline, opline->extended_value)]);
723-
/* break missing intentionally */
723+
fallthrough;
724724
case ZEND_JMPZ:
725725
case ZEND_JMPNZ:
726726
case ZEND_JMPZ_EX:

‎ext/opcache/Optimizer/zend_ssa.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ static zend_always_inline int _zend_ssa_rename_op(const zend_op_array *op_array,
713713
break;
714714
case ZEND_ADD_ARRAY_ELEMENT:
715715
ssa_ops[k].result_use = var[EX_VAR_TO_NUM(opline->result.var)];
716-
/* break missing intentionally */
716+
fallthrough;
717717
case ZEND_INIT_ARRAY:
718718
if (((build_flags & ZEND_SSA_RC_INFERENCE)
719719
|| (opline->extended_value & ZEND_ARRAY_ELEMENT_REF))

0 commit comments

Comments
 (0)