replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Extend -Wtautological-overlap-compare to more cases. 

Previously, -Wtautological-overlap-compare did not warn on cases where the
boolean expression was in an assignment or return statement.  This patch
should cause all boolean statements to be passed to the tautological compare
checks in the CFG analysis.

This is one of the issues from PR13101

llvm-svn: 290920
This commit is contained in:
Richard Trieu 2017-01-04 00:46:30 +00:00
parent 287d949667
commit 6a6af52ba6
2 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/Analysis/CFG.cpp
View File

@ -1690,15 +1690,19 @@ CFGBuilder::VisitLogicalOperator(BinaryOperator *B,
// we have been provided.
ExitBlock = RHSBlock = createBlock(false);
// Even though KnownVal is only used in the else branch of the next
// conditional, tryEvaluateBool performs additional checking on the
// Expr, so it should be called unconditionally.
TryResult KnownVal = tryEvaluateBool(RHS);
if (!KnownVal.isKnown())
KnownVal = tryEvaluateBool(B);
if (!Term) {
assert(TrueBlock == FalseBlock);
addSuccessor(RHSBlock, TrueBlock);
}
else {
RHSBlock->setTerminator(Term);
TryResult KnownVal = tryEvaluateBool(RHS);
if (!KnownVal.isKnown())
KnownVal = tryEvaluateBool(B);
addSuccessor(RHSBlock, TrueBlock, !KnownVal.isFalse());
addSuccessor(RHSBlock, FalseBlock, !KnownVal.isTrue());
}

45
clang/test/Sema/warn-overlap.c
View File

@ -96,3 +96,48 @@ void array_out_of_bounds() {
int buffer[4];
x = (-7 > 0) ? (buffer[-7]) : 0;
}
void bool_contexts(int x) {
if (x > 4 || x < 10) {}
// expected-warning@-1{{overlapping comparisons always evaluate to true}}
for (;x > 4 || x < 10;) {}
// expected-warning@-1{{overlapping comparisons always evaluate to true}}
while (x > 4 || x < 10) {}
// expected-warning@-1{{overlapping comparisons always evaluate to true}}
do {} while (x > 4 || x < 10);
// expected-warning@-1{{overlapping comparisons always evaluate to true}}
x = (x > 4 || x < 10) ? 1 : 2;
// expected-warning@-1{{overlapping comparisons always evaluate to true}}
if ((void)5, x > 4 || x < 10) {}
// expected-warning@-1{{overlapping comparisons always evaluate to true}}
}
void assignment(int x) {
int a = x > 4 || x < 10;
// expected-warning@-1{{overlapping comparisons always evaluate to true}}
int b = x < 2 && x > 5;
// expected-warning@-1{{overlapping comparisons always evaluate to false}}
int c = x != 1 || x != 3;
// expected-warning@-1{{overlapping comparisons always evaluate to true}}
int d = x == 1 && x == 2;
// expected-warning@-1{{overlapping comparisons always evaluate to false}}
int e = x < 1 || x != 0;
// expected-warning@-1{{overlapping comparisons always evaluate to true}}
}
int returns(int x) {
return x > 4 || x < 10;
// expected-warning@-1{{overlapping comparisons always evaluate to true}}
return x < 2 && x > 5;
// expected-warning@-1{{overlapping comparisons always evaluate to false}}
return x != 1 || x != 3;
// expected-warning@-1{{overlapping comparisons always evaluate to true}}
return x == 1 && x == 2;
// expected-warning@-1{{overlapping comparisons always evaluate to false}}
return x < 1 || x != 0;
// expected-warning@-1{{overlapping comparisons always evaluate to true}}
}