Skip to content

Commit 5ac239c

Browse files
GirgiasGirgias
committed
Use ZEND_FALLTHROUGH; instead
1 parent 0fe7051 commit 5ac239c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+212
-212
lines changed

‎Zend/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-
fallthrough;
402+
ZEND_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-
fallthrough;
1040+
ZEND_FALLTHROUGH;
10411041
case ZEND_JMPZ:
10421042
case ZEND_JMPNZ:
10431043
case ZEND_JMPZ_EX:

‎Zend/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-
fallthrough;
472+
ZEND_FALLTHROUGH;
473473
default:
474474
/* don't merge other types */
475475
map[i] = j;

‎Zend/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-
fallthrough;
615+
ZEND_FALLTHROUGH;
616616
case ZEND_JMPZ:
617617
case ZEND_JMPNZ:
618618
case ZEND_JMPZ_EX:

‎Zend/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-
fallthrough;
62+
ZEND_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-
fallthrough;
181+
ZEND_FALLTHROUGH;
182182
case ZEND_INIT_DYNAMIC_CALL:
183183
case ZEND_INIT_USER_CALL:
184184
call_stack[call].opline = opline;

‎Zend/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-
fallthrough;
594+
ZEND_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-
fallthrough;
697+
ZEND_FALLTHROUGH;
698698
case PARTIAL_OBJECT:
699699
return ct_eval_add_obj_prop(result, value, key);
700700
default:

‎Zend/Optimizer/zend_cfg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ ZEND_API int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, u
314314
break;
315315
case ZEND_INCLUDE_OR_EVAL:
316316
flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS;
317-
fallthrough;
317+
ZEND_FALLTHROUGH;
318318
case ZEND_GENERATOR_CREATE:
319319
case ZEND_YIELD:
320320
case ZEND_YIELD_FROM:

‎Zend/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-
fallthrough;
198+
ZEND_FALLTHROUGH;
199199
case ZEND_INIT_ARRAY:
200200
if (((build_flags & ZEND_SSA_RC_INFERENCE)
201201
|| (opline->extended_value & ZEND_ARRAY_ELEMENT_REF))

‎Zend/Optimizer/zend_inference.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4437,7 +4437,7 @@ ZEND_API int zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op,
44374437
/* Division by zero */
44384438
return 1;
44394439
}
4440-
fallthrough;
4440+
ZEND_FALLTHROUGH;
44414441
case ZEND_SUB:
44424442
case ZEND_MUL:
44434443
case ZEND_POW:
@@ -4537,7 +4537,7 @@ ZEND_API int zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op,
45374537
if (t1 & MAY_BE_REF) {
45384538
return 1;
45394539
}
4540-
fallthrough;
4540+
ZEND_FALLTHROUGH;
45414541
case ZEND_BIND_STATIC:
45424542
case ZEND_UNSET_VAR:
45434543
return (t1 & (MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_ARRAY_OF_OBJECT|MAY_BE_ARRAY_OF_RESOURCE|MAY_BE_ARRAY_OF_ARRAY));

‎Zend/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-
fallthrough;
328+
ZEND_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-
fallthrough;
356+
ZEND_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-
fallthrough;
510+
ZEND_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-
fallthrough;
677+
ZEND_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-
fallthrough;
723+
ZEND_FALLTHROUGH;
724724
case ZEND_JMPZ:
725725
case ZEND_JMPNZ:
726726
case ZEND_JMPZ_EX:

‎Zend/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-
fallthrough;
716+
ZEND_FALLTHROUGH;
717717
case ZEND_INIT_ARRAY:
718718
if (((build_flags & ZEND_SSA_RC_INFERENCE)
719719
|| (opline->extended_value & ZEND_ARRAY_ELEMENT_REF))

‎Zend/zend_API.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ static const char *zend_parse_arg_impl(zval *arg, va_list *va, const char **spec
884884
case 'Z': /* replace with 'z' */
885885
case 'L': /* replace with 'l' */
886886
ZEND_ASSERT(0 && "ZPP modifier no longer supported");
887-
fallthrough;
887+
ZEND_FALLTHROUGH;
888888
default:
889889
return "unknown";
890890
}

‎Zend/zend_ast.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2013,7 +2013,7 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
20132013
break;
20142014
case ZEND_AST_PROP_ELEM:
20152015
smart_str_appendc(str, '$');
2016-
fallthrough;
2016+
ZEND_FALLTHROUGH;
20172017
case ZEND_AST_CONST_ELEM:
20182018
zend_ast_export_name(str, ast->child[0], 0, indent);
20192019
APPEND_DEFAULT_VALUE(1);

‎Zend/zend_builtin_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ ZEND_FUNCTION(define)
528528
val = &val_free;
529529
break;
530530
}
531-
fallthrough;
531+
ZEND_FALLTHROUGH;
532532
default:
533533
zval_ptr_dtor(&val_free);
534534
zend_argument_type_error(2, "cannot be an object, %s given", zend_zval_type_name(val));

‎Zend/zend_execute.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ static zend_never_inline ZEND_COLD zval *_get_zval_cv_lookup(zval *ptr, uint32_t
298298
break;
299299
case BP_VAR_RW:
300300
zval_undefined_cv(var EXECUTE_DATA_CC);
301-
fallthrough;
301+
ZEND_FALLTHROUGH;
302302
case BP_VAR_W:
303303
ZVAL_NULL(ptr);
304304
break;
@@ -1374,7 +1374,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type
13741374
}
13751375
case IS_UNDEF:
13761376
ZVAL_UNDEFINED_OP2();
1377-
fallthrough;
1377+
ZEND_FALLTHROUGH;
13781378
case IS_DOUBLE:
13791379
case IS_NULL:
13801380
case IS_FALSE:
@@ -2038,7 +2038,7 @@ static zend_never_inline zend_uchar slow_index_convert(HashTable *ht, const zval
20382038
if (EG(exception)) {
20392039
return IS_NULL;
20402040
}
2041-
fallthrough;
2041+
ZEND_FALLTHROUGH;
20422042
}
20432043
case IS_NULL:
20442044
value->str = ZSTR_EMPTY_ALLOC();
@@ -2078,7 +2078,7 @@ static zend_always_inline zval *zend_fetch_dimension_address_inner(HashTable *ht
20782078
switch (type) {
20792079
case BP_VAR_R:
20802080
zend_undefined_offset(hval);
2081-
fallthrough;
2081+
ZEND_FALLTHROUGH;
20822082
case BP_VAR_UNSET:
20832083
case BP_VAR_IS:
20842084
retval = &EG(uninitialized_zval);
@@ -2087,7 +2087,7 @@ static zend_always_inline zval *zend_fetch_dimension_address_inner(HashTable *ht
20872087
if (UNEXPECTED(zend_undefined_offset_write(ht, hval) == FAILURE)) {
20882088
return NULL;
20892089
}
2090-
fallthrough;
2090+
ZEND_FALLTHROUGH;
20912091
case BP_VAR_W:
20922092
retval = zend_hash_index_add_new(ht, hval, &EG(uninitialized_zval));
20932093
break;
@@ -2105,7 +2105,7 @@ static zend_always_inline zval *zend_fetch_dimension_address_inner(HashTable *ht
21052105
switch (type) {
21062106
case BP_VAR_R:
21072107
zend_undefined_index(offset_key);
2108-
fallthrough;
2108+
ZEND_FALLTHROUGH;
21092109
case BP_VAR_UNSET:
21102110
case BP_VAR_IS:
21112111
retval = &EG(uninitialized_zval);
@@ -2343,7 +2343,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
23432343
}
23442344
case IS_UNDEF:
23452345
ZVAL_UNDEFINED_OP2();
2346-
fallthrough;
2346+
ZEND_FALLTHROUGH;
23472347
case IS_DOUBLE:
23482348
case IS_NULL:
23492349
case IS_FALSE:

‎Zend/zend_highlight.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ ZEND_API void zend_strip(void)
184184
zend_write(" ", sizeof(" ") - 1);
185185
prev_space = 1;
186186
}
187-
fallthrough;
187+
ZEND_FALLTHROUGH;
188188
case T_COMMENT:
189189
case T_DOC_COMMENT:
190190
ZVAL_UNDEF(&token);

‎Zend/zend_ini_scanner.l

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ static void zend_ini_copy_typed_value(zval *retval, const int type, const char *
187187
if (convert_to_number(retval, str, len) == SUCCESS) {
188188
break;
189189
}
190-
fallthrough;
190+
ZEND_FALLTHROUGH;
191191
default:
192192
zend_ini_copy_value(retval, str, len);
193193
}
@@ -329,7 +329,7 @@ static void zend_ini_escape_string(zval *lval, char *str, int len, char quote_ty
329329
*t++ = *s;
330330
break;
331331
}
332-
fallthrough;
332+
ZEND_FALLTHROUGH;
333333
case '\\':
334334
case '$':
335335
*t++ = *s;
@@ -608,7 +608,7 @@ end_raw_value_chars:
608608
if (YYCURSOR < YYLIMIT && *YYCURSOR != '"') {
609609
YYCURSOR++;
610610
}
611-
fallthrough;
611+
ZEND_FALLTHROUGH;
612612
default:
613613
continue;
614614
}

‎Zend/zend_language_scanner.l

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ static zend_result zend_scan_escape_string(zval *zendlval, char *str, int len, c
998998
*t++ = *s;
999999
break;
10001000
}
1001-
fallthrough;
1001+
ZEND_FALLTHROUGH;
10021002
case '\\':
10031003
case '$':
10041004
*t++ = *s;
@@ -2373,7 +2373,7 @@ inline_char_handler:
23732373
YYCURSOR--;
23742374
break;
23752375
}
2376-
fallthrough;
2376+
ZEND_FALLTHROUGH;
23772377
default:
23782378
continue;
23792379
}
@@ -2556,7 +2556,7 @@ skip_escape_conversion:
25562556
if (YYCURSOR < YYLIMIT) {
25572557
YYCURSOR++;
25582558
}
2559-
fallthrough;
2559+
ZEND_FALLTHROUGH;
25602560
default:
25612561
continue;
25622562
}
@@ -2793,7 +2793,7 @@ skip_escape_conversion:
27932793
if (YYCURSOR < YYLIMIT) {
27942794
YYCURSOR++;
27952795
}
2796-
fallthrough;
2796+
ZEND_FALLTHROUGH;
27972797
default:
27982798
continue;
27992799
}
@@ -2840,7 +2840,7 @@ double_quotes_scan_done:
28402840
if (YYCURSOR < YYLIMIT) {
28412841
YYCURSOR++;
28422842
}
2843-
fallthrough;
2843+
ZEND_FALLTHROUGH;
28442844
default:
28452845
continue;
28462846
}
@@ -2876,7 +2876,7 @@ double_quotes_scan_done:
28762876
if (*YYCURSOR == '\n') {
28772877
YYCURSOR++;
28782878
}
2879-
fallthrough;
2879+
ZEND_FALLTHROUGH;
28802880
case '\n':
28812881
indentation = spacing = 0;
28822882
@@ -2946,7 +2946,7 @@ double_quotes_scan_done:
29462946
if (YYCURSOR < YYLIMIT && *YYCURSOR != '\n' && *YYCURSOR != '\r') {
29472947
YYCURSOR++;
29482948
}
2949-
fallthrough;
2949+
ZEND_FALLTHROUGH;
29502950
default:
29512951
continue;
29522952
}
@@ -3000,7 +3000,7 @@ heredoc_scan_done:
30003000
if (*YYCURSOR == '\n') {
30013001
YYCURSOR++;
30023002
}
3003-
fallthrough;
3003+
ZEND_FALLTHROUGH;
30043004
case '\n':
30053005
indentation = spacing = 0;
30063006
@@ -3051,7 +3051,7 @@ heredoc_scan_done:
30513051
30523052
goto nowdoc_scan_done;
30533053
}
3054-
fallthrough;
3054+
ZEND_FALLTHROUGH;
30553055
default:
30563056
continue;
30573057
}

‎Zend/zend_object_handlers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1782,7 +1782,7 @@ ZEND_API HashTable *zend_std_get_properties_for(zend_object *obj, zend_prop_purp
17821782
}
17831783
return ht;
17841784
}
1785-
fallthrough;
1785+
ZEND_FALLTHROUGH;
17861786
case ZEND_PROP_PURPOSE_ARRAY_CAST:
17871787
case ZEND_PROP_PURPOSE_SERIALIZE:
17881788
case ZEND_PROP_PURPOSE_VAR_EXPORT:

0 commit comments

Comments
 (0)