Skip to content

Commit

Permalink
Revert "lib: Revert use of fallthrough pseudo-keyword in lib/"
Browse files Browse the repository at this point in the history 
This reverts commit 6a9dc5f ("lib: Revert use of fallthrough
pseudo-keyword in lib/")

Now that we can build arch/powerpc/boot/ free of -Wimplicit-fallthrough,
re-enable these fixes for lib/.

Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Tested-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Miguel Ojeda <ojeda@kernel.org>
Link: https://github.com/ClangBuiltLinux/linux/issues/236
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
  • Loading branch information
Nick Desaulniers authored and Gustavo A. R. Silva committed Nov 18, 2020
1 parent 7743383 commit 4c1ca83
Show file tree
Hide file tree
Showing 16 changed files with 64 additions and 64 deletions.
4 changes: 2 additions & 2 deletions lib/asn1_decoder.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ int asn1_ber_decoder(const struct asn1_decoder *decoder,
case ASN1_OP_END_SET_ACT:
if (unlikely(!(flags & FLAG_MATCHED)))
goto tag_mismatch;
/* fall through */
fallthrough;

case ASN1_OP_END_SEQ:
case ASN1_OP_END_SET_OF:
Expand Down Expand Up @@ -448,7 +448,7 @@ int asn1_ber_decoder(const struct asn1_decoder *decoder,
pc += asn1_op_lengths[op];
goto next_op;
}
/* fall through */
fallthrough;

case ASN1_OP_ACT:
ret = actions[machine[pc + 1]](context, hdr, tag, data + tdp, len);
Expand Down
2 changes: 1 addition & 1 deletion lib/assoc_array.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1113,7 +1113,7 @@ struct assoc_array_edit *assoc_array_delete(struct assoc_array *array,
index_key))
goto found_leaf;
}
/* fall through */
fallthrough;
case assoc_array_walk_tree_empty:
case assoc_array_walk_found_wrong_shortcut:
default:
Expand Down
4 changes: 2 additions & 2 deletions lib/bootconfig.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ int __init xbc_init(char *buf, const char **emsg, int *epos)
q - 2);
break;
}
/* fall through */
fallthrough;
case '=':
ret = xbc_parse_kv(&p, q, c);
break;
Expand All @@ -836,7 +836,7 @@ int __init xbc_init(char *buf, const char **emsg, int *epos)
break;
case '#':
q = skip_comment(q);
/* fall through */
fallthrough;
case ';':
case '\n':
ret = xbc_parse_key(&p, q);
Expand Down
10 changes: 5 additions & 5 deletions lib/cmdline.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,23 +132,23 @@ unsigned long long memparse(const char *ptr, char **retptr)
case 'E':
case 'e':
ret <<= 10;
/* fall through */
fallthrough;
case 'P':
case 'p':
ret <<= 10;
/* fall through */
fallthrough;
case 'T':
case 't':
ret <<= 10;
/* fall through */
fallthrough;
case 'G':
case 'g':
ret <<= 10;
/* fall through */
fallthrough;
case 'M':
case 'm':
ret <<= 10;
/* fall through */
fallthrough;
case 'K':
case 'k':
ret <<= 10;
Expand Down
2 changes: 1 addition & 1 deletion lib/dim/net_dim.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ void net_dim(struct dim *dim, struct dim_sample end_sample)
schedule_work(&dim->work);
break;
}
/* fall through */
fallthrough;
case DIM_START_MEASURE:
dim_update_sample(end_sample.event_ctr, end_sample.pkt_ctr,
end_sample.byte_ctr, &dim->start_sample);
Expand Down
4 changes: 2 additions & 2 deletions lib/dim/rdma_dim.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static bool rdma_dim_decision(struct dim_stats *curr_stats, struct dim *dim)
break;
case DIM_STATS_WORSE:
dim_turn(dim);
/* fall through */
fallthrough;
case DIM_STATS_BETTER:
step_res = rdma_dim_step(dim);
if (step_res == DIM_ON_EDGE)
Expand Down Expand Up @@ -94,7 +94,7 @@ void rdma_dim(struct dim *dim, u64 completions)
schedule_work(&dim->work);
break;
}
/* fall through */
fallthrough;
case DIM_START_MEASURE:
dim->state = DIM_MEASURE_IN_PROGRESS;
dim_update_sample_with_comps(curr_sample->event_ctr, 0, 0,
Expand Down
2 changes: 1 addition & 1 deletion lib/glob.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ bool __pure glob_match(char const *pat, char const *str)
break;
case '\\':
d = *pat++;
/* fall through */
fallthrough;
default: /* Literal character */
literal:
if (c == d) {
Expand Down
36 changes: 18 additions & 18 deletions lib/siphash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ u64 __siphash_aligned(const void *data, size_t len, const siphash_key_t *key)
bytemask_from_count(left)));
#else
switch (left) {
case 7: b |= ((u64)end[6]) << 48; /* fall through */
case 6: b |= ((u64)end[5]) << 40; /* fall through */
case 5: b |= ((u64)end[4]) << 32; /* fall through */
case 7: b |= ((u64)end[6]) << 48; fallthrough;
case 6: b |= ((u64)end[5]) << 40; fallthrough;
case 5: b |= ((u64)end[4]) << 32; fallthrough;
case 4: b |= le32_to_cpup(data); break;
case 3: b |= ((u64)end[2]) << 16; /* fall through */
case 3: b |= ((u64)end[2]) << 16; fallthrough;
case 2: b |= le16_to_cpup(data); break;
case 1: b |= end[0];
}
Expand Down Expand Up @@ -101,11 +101,11 @@ u64 __siphash_unaligned(const void *data, size_t len, const siphash_key_t *key)
bytemask_from_count(left)));
#else
switch (left) {
case 7: b |= ((u64)end[6]) << 48; /* fall through */
case 6: b |= ((u64)end[5]) << 40; /* fall through */
case 5: b |= ((u64)end[4]) << 32; /* fall through */
case 7: b |= ((u64)end[6]) << 48; fallthrough;
case 6: b |= ((u64)end[5]) << 40; fallthrough;
case 5: b |= ((u64)end[4]) << 32; fallthrough;
case 4: b |= get_unaligned_le32(end); break;
case 3: b |= ((u64)end[2]) << 16; /* fall through */
case 3: b |= ((u64)end[2]) << 16; fallthrough;
case 2: b |= get_unaligned_le16(end); break;
case 1: b |= end[0];
}
Expand Down Expand Up @@ -268,11 +268,11 @@ u32 __hsiphash_aligned(const void *data, size_t len, const hsiphash_key_t *key)
bytemask_from_count(left)));
#else
switch (left) {
case 7: b |= ((u64)end[6]) << 48; /* fall through */
case 6: b |= ((u64)end[5]) << 40; /* fall through */
case 5: b |= ((u64)end[4]) << 32; /* fall through */
case 7: b |= ((u64)end[6]) << 48; fallthrough;
case 6: b |= ((u64)end[5]) << 40; fallthrough;
case 5: b |= ((u64)end[4]) << 32; fallthrough;
case 4: b |= le32_to_cpup(data); break;
case 3: b |= ((u64)end[2]) << 16; /* fall through */
case 3: b |= ((u64)end[2]) << 16; fallthrough;
case 2: b |= le16_to_cpup(data); break;
case 1: b |= end[0];
}
Expand Down Expand Up @@ -301,11 +301,11 @@ u32 __hsiphash_unaligned(const void *data, size_t len,
bytemask_from_count(left)));
#else
switch (left) {
case 7: b |= ((u64)end[6]) << 48; /* fall through */
case 6: b |= ((u64)end[5]) << 40; /* fall through */
case 5: b |= ((u64)end[4]) << 32; /* fall through */
case 7: b |= ((u64)end[6]) << 48; fallthrough;
case 6: b |= ((u64)end[5]) << 40; fallthrough;
case 5: b |= ((u64)end[4]) << 32; fallthrough;
case 4: b |= get_unaligned_le32(end); break;
case 3: b |= ((u64)end[2]) << 16; /* fall through */
case 3: b |= ((u64)end[2]) << 16; fallthrough;
case 2: b |= get_unaligned_le16(end); break;
case 1: b |= end[0];
}
Expand Down Expand Up @@ -431,7 +431,7 @@ u32 __hsiphash_aligned(const void *data, size_t len, const hsiphash_key_t *key)
v0 ^= m;
}
switch (left) {
case 3: b |= ((u32)end[2]) << 16; /* fall through */
case 3: b |= ((u32)end[2]) << 16; fallthrough;
case 2: b |= le16_to_cpup(data); break;
case 1: b |= end[0];
}
Expand All @@ -454,7 +454,7 @@ u32 __hsiphash_unaligned(const void *data, size_t len,
v0 ^= m;
}
switch (left) {
case 3: b |= ((u32)end[2]) << 16; /* fall through */
case 3: b |= ((u32)end[2]) << 16; fallthrough;
case 2: b |= get_unaligned_le16(end); break;
case 1: b |= end[0];
}
Expand Down
2 changes: 1 addition & 1 deletion lib/ts_fsm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ static unsigned int fsm_find(struct ts_config *conf, struct ts_state *state)
TOKEN_MISMATCH();

block_idx++;
/* fall through */
fallthrough;

case TS_FSM_ANY:
if (next == NULL)
Expand Down
14 changes: 7 additions & 7 deletions lib/vsprintf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1265,7 +1265,7 @@ char *mac_address_string(char *buf, char *end, u8 *addr,

case 'R':
reversed = true;
/* fall through */
fallthrough;

default:
separator = ':';
Expand Down Expand Up @@ -1682,7 +1682,7 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
switch (*(++fmt)) {
case 'L':
uc = true;
/* fall through */
fallthrough;
case 'l':
index = guid_index;
break;
Expand Down Expand Up @@ -2219,7 +2219,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
case 'S':
case 's':
ptr = dereference_symbol_descriptor(ptr);
/* fall through */
fallthrough;
case 'B':
return symbol_string(buf, end, ptr, spec, fmt);
case 'R':
Expand Down Expand Up @@ -2450,7 +2450,7 @@ int format_decode(const char *fmt, struct printf_spec *spec)

case 'x':
spec->flags |= SMALL;
/* fall through */
fallthrough;

case 'X':
spec->base = 16;
Expand All @@ -2468,7 +2468,7 @@ int format_decode(const char *fmt, struct printf_spec *spec)
* utility, treat it as any other invalid or
* unsupported format specifier.
*/
/* fall through */
fallthrough;

default:
WARN_ONCE(1, "Please remove unsupported %%%c in format string\n", *fmt);
Expand Down Expand Up @@ -3411,10 +3411,10 @@ int vsscanf(const char *buf, const char *fmt, va_list args)
break;
case 'i':
base = 0;
/* fall through */
fallthrough;
case 'd':
is_sign = true;
/* fall through */
fallthrough;
case 'u':
break;
case '%':
Expand Down
4 changes: 2 additions & 2 deletions lib/xz/xz_dec_lzma2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1043,7 +1043,7 @@ XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,

s->lzma2.sequence = SEQ_LZMA_PREPARE;

/* fall through */
fallthrough;

case SEQ_LZMA_PREPARE:
if (s->lzma2.compressed < RC_INIT_BYTES)
Expand All @@ -1055,7 +1055,7 @@ XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,
s->lzma2.compressed -= RC_INIT_BYTES;
s->lzma2.sequence = SEQ_LZMA_RUN;

/* fall through */
fallthrough;

case SEQ_LZMA_RUN:
/*
Expand Down
16 changes: 8 additions & 8 deletions lib/xz/xz_dec_stream.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b)
if (ret != XZ_OK)
return ret;

/* fall through */
fallthrough;

case SEQ_BLOCK_START:
/* We need one byte of input to continue. */
Expand All @@ -608,7 +608,7 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b)
s->temp.pos = 0;
s->sequence = SEQ_BLOCK_HEADER;

/* fall through */
fallthrough;

case SEQ_BLOCK_HEADER:
if (!fill_temp(s, b))
Expand All @@ -620,7 +620,7 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b)

s->sequence = SEQ_BLOCK_UNCOMPRESS;

/* fall through */
fallthrough;

case SEQ_BLOCK_UNCOMPRESS:
ret = dec_block(s, b);
Expand All @@ -629,7 +629,7 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b)

s->sequence = SEQ_BLOCK_PADDING;

/* fall through */
fallthrough;

case SEQ_BLOCK_PADDING:
/*
Expand All @@ -651,7 +651,7 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b)

s->sequence = SEQ_BLOCK_CHECK;

/* fall through */
fallthrough;

case SEQ_BLOCK_CHECK:
if (s->check_type == XZ_CHECK_CRC32) {
Expand All @@ -675,7 +675,7 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b)

s->sequence = SEQ_INDEX_PADDING;

/* fall through */
fallthrough;

case SEQ_INDEX_PADDING:
while ((s->index.size + (b->in_pos - s->in_start))
Expand All @@ -699,7 +699,7 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b)

s->sequence = SEQ_INDEX_CRC32;

/* fall through */
fallthrough;

case SEQ_INDEX_CRC32:
ret = crc32_validate(s, b);
Expand All @@ -709,7 +709,7 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b)
s->temp.size = STREAM_HEADER_SIZE;
s->sequence = SEQ_STREAM_FOOTER;

/* fall through */
fallthrough;

case SEQ_STREAM_FOOTER:
if (!fill_temp(s, b))
Expand Down
10 changes: 5 additions & 5 deletions lib/zstd/bitstream.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,15 +259,15 @@ ZSTD_STATIC size_t BIT_initDStream(BIT_DStream_t *bitD, const void *srcBuffer, s
bitD->bitContainer = *(const BYTE *)(bitD->start);
switch (srcSize) {
case 7: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[6]) << (sizeof(bitD->bitContainer) * 8 - 16);
/* fall through */
fallthrough;
case 6: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[5]) << (sizeof(bitD->bitContainer) * 8 - 24);
/* fall through */
fallthrough;
case 5: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[4]) << (sizeof(bitD->bitContainer) * 8 - 32);
/* fall through */
fallthrough;
case 4: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[3]) << 24;
/* fall through */
fallthrough;
case 3: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[2]) << 16;
/* fall through */
fallthrough;
case 2: bitD->bitContainer += (size_t)(((const BYTE *)(srcBuffer))[1]) << 8;
default:;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/zstd/compress.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3182,7 +3182,7 @@ static size_t ZSTD_compressStream_generic(ZSTD_CStream *zcs, void *dst, size_t *
zcs->outBuffFlushedSize = 0;
zcs->stage = zcss_flush; /* pass-through to flush stage */
}
/* fall through */
fallthrough;

case zcss_flush: {
size_t const toFlush = zcs->outBuffContentSize - zcs->outBuffFlushedSize;
Expand Down
Loading

0 comments on commit 4c1ca83

Please sign in to comment.