Skip to content

Commit 0a8ea23

Browse files
nathanchanceterrelln
authored andcommitted
lib: zstd: Add cast to silence clang's -Wbitwise-instead-of-logical
A new warning in clang warns that there is an instance where boolean expressions are being used with bitwise operators instead of logical ones: lib/zstd/decompress/huf_decompress.c:890:25: warning: use of bitwise '&' with boolean operands [-Wbitwise-instead-of-logical] (BIT_reloadDStreamFast(&bitD1) == BIT_DStream_unfinished) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ zstd does this frequently to help with performance, as logical operators have branches whereas bitwise ones do not. To fix this warning in other cases, the expressions were placed on separate lines with the '&=' operator; however, this particular instance was moved away from that so that it could be surrounded by LIKELY, which is a macro for __builtin_expect(), to help with a performance regression, according to upstream zstd pull #1973. Aside from switching to logical operators, which is likely undesirable in this instance, or disabling the warning outright, the solution is casting one of the expressions to an integer type to make it clear to clang that the author knows what they are doing. Add a cast to U32 to silence the warning. The first U32 cast is to silence an instance of -Wshorten-64-to-32 because __builtin_expect() returns long so it cannot be moved. Link: ClangBuiltLinux#1486 Link: facebook/zstd#1973 Reported-by: Nick Desaulniers <[email protected]> Signed-off-by: Nathan Chancellor <[email protected]> Signed-off-by: Nick Terrell <[email protected]>
1 parent a99a65c commit 0a8ea23

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/zstd/decompress/huf_decompress.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ HUF_decompress4X2_usingDTable_internal_body(
886886
HUF_DECODE_SYMBOLX2_0(op2, &bitD2);
887887
HUF_DECODE_SYMBOLX2_0(op3, &bitD3);
888888
HUF_DECODE_SYMBOLX2_0(op4, &bitD4);
889-
endSignal = (U32)LIKELY(
889+
endSignal = (U32)LIKELY((U32)
890890
(BIT_reloadDStreamFast(&bitD1) == BIT_DStream_unfinished)
891891
& (BIT_reloadDStreamFast(&bitD2) == BIT_DStream_unfinished)
892892
& (BIT_reloadDStreamFast(&bitD3) == BIT_DStream_unfinished)

0 commit comments

Comments
 (0)