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

Add fixit notes for -Wconstant-logical-operand. 

llvm-svn: 137620
This commit is contained in:
Matt Beaumont-Gay 2011-08-15 17:50:06 +00:00
parent ccf5233ae8
commit 0a0ba9d883
6 changed files with 108 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/include/clang/Basic/DiagnosticSemaKinds.td
View File

@ -2940,8 +2940,12 @@ def note_precedence_conditional_silence : Note<
"place parentheses around the '%0' expression to silence this warning">;
def warn_logical_instead_of_bitwise : Warning<
"use of logical %0 with constant operand; switch to bitwise %1 or "
"remove constant">, InGroup<DiagGroup<"constant-logical-operand">>;
"use of logical '%0' with constant operand">,
InGroup<DiagGroup<"constant-logical-operand">>;
def note_logical_instead_of_bitwise_change_operator : Note<
"use '%0' for a bitwise operation">;
def note_logical_instead_of_bitwise_remove_constant : Note<
"remove constant to silence this warning">;
def warn_bitwise_and_in_bitwise_or : Warning<
"'&' within '|'">, InGroup<BitwiseOpParentheses>;

19
clang/lib/Sema/SemaExpr.cpp
View File

@ -6719,8 +6719,23 @@ inline QualType Sema::CheckLogicalOperands( // C99 6.5.[13,14]
(Result.Val.getInt() != 0 && Result.Val.getInt() != 1)) {
Diag(Loc, diag::warn_logical_instead_of_bitwise)
<< rex.get()->getSourceRange()
<< (Opc == BO_LAnd ? "&&" : "||")
<< (Opc == BO_LAnd ? "&" : "|");
<< (Opc == BO_LAnd ? "&&" : "||");
// Suggest replacing the logical operator with the bitwise version
Diag(Loc, diag::note_logical_instead_of_bitwise_change_operator)
<< (Opc == BO_LAnd ? "&" : "|")
<< FixItHint::CreateReplacement(SourceRange(
Loc, Lexer::getLocForEndOfToken(Loc, 0, getSourceManager(),
getLangOptions())),
Opc == BO_LAnd ? "&" : "|");
if (Opc == BO_LAnd)
// Suggest replacing "Foo() && kNonZero" with "Foo()"
Diag(Loc, diag::note_logical_instead_of_bitwise_remove_constant)
<< FixItHint::CreateRemoval(
SourceRange(
Lexer::getLocForEndOfToken(lex.get()->getLocEnd(),
0, getSourceManager(),
getLangOptions()),
rex.get()->getLocEnd()));
}
}

32
clang/test/Sema/exprs.c
View File

@ -183,7 +183,9 @@ void test19() {
}
int test20(int x) {
return x && 4; // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x && 4; // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
return x && sizeof(int) == 4; // no warning, RHS is logical op.
@ -192,20 +194,32 @@ int test20(int x) {
return x || 0;
return x || 1;
return x || -1; // expected-warning {{use of logical || with constant operand; switch to bitwise | or remove constant}}
return x || 5; // expected-warning {{use of logical || with constant operand; switch to bitwise | or remove constant}}
return x || -1; // expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
return x || 5; // expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
return x && 0;
return x && 1;
return x && -1; // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x && 5; // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x && -1; // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
return x && 5; // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
return x || (0);
return x || (1);
return x || (-1); // expected-warning {{use of logical || with constant operand; switch to bitwise | or remove constant}}
return x || (5); // expected-warning {{use of logical || with constant operand; switch to bitwise | or remove constant}}
return x || (-1); // expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
return x || (5); // expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
return x && (0);
return x && (1);
return x && (-1); // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x && (5); // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x && (-1); // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
return x && (5); // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
}

3
clang/test/Sema/i-c-e.c
View File

@ -53,7 +53,8 @@ char z[__builtin_constant_p(4) ? 1 : -1];
// Comma tests
int comma1[0?1,2:3]; // expected-warning {{expression result unused}}
int comma2[1||(1,2)]; // expected-warning {{expression result unused}} \
// expected-warning {{use of logical || with constant operand}}
// expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
int comma3[(1,2)]; // expected-warning {{size of static array must be an integer constant expression}} \
// expected-warning {{expression result unused}}

7
clang/test/SemaCXX/bool.cpp
View File

@ -25,6 +25,9 @@ void static_assert_arg_is_bool(T x) {
void test2() {
int n = 2;
static_assert_arg_is_bool(n && 4); // expected-warning {{use of logical && with constant operand}}
static_assert_arg_is_bool(n || 5); // expected-warning {{use of logical || with constant operand}}
static_assert_arg_is_bool(n && 4); // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
static_assert_arg_is_bool(n || 5); // expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
}

75
clang/test/SemaCXX/expressions.cpp
View File

@ -34,7 +34,9 @@ namespace test1 {
}
int test2(int x) {
return x && 4; // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x && 4; // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
return x && sizeof(int) == 4; // no warning, RHS is logical op.
return x && true;
@ -42,38 +44,69 @@ int test2(int x) {
return x || true;
return x || false;
return x && (unsigned)0; // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x && (unsigned)0; // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
return x || (unsigned)1; // expected-warning {{use of logical || with constant operand; switch to bitwise | or remove constant}}
return x || (unsigned)1; // expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
return x || 0; // expected-warning {{use of logical || with constant operand; switch to bitwise | or remove constant}}
return x || 1; // expected-warning {{use of logical || with constant operand; switch to bitwise | or remove constant}}
return x || -1; // expected-warning {{use of logical || with constant operand; switch to bitwise | or remove constant}}
return x || 5; // expected-warning {{use of logical || with constant operand; switch to bitwise | or remove constant}}
return x && 0; // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x && 1; // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x && -1; // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x && 5; // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x || (0); // expected-warning {{use of logical || with constant operand; switch to bitwise | or remove constant}}
return x || (1); // expected-warning {{use of logical || with constant operand; switch to bitwise | or remove constant}}
return x || (-1); // expected-warning {{use of logical || with constant operand; switch to bitwise | or remove constant}}
return x || (5); // expected-warning {{use of logical || with constant operand; switch to bitwise | or remove constant}}
return x && (0); // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x && (1); // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x && (-1); // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x && (5); // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
return x || 0; // expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
return x || 1; // expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
return x || -1; // expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
return x || 5; // expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
return x && 0; // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
return x && 1; // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
return x && -1; // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
return x && 5; // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
return x || (0); // expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
return x || (1); // expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
return x || (-1); // expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
return x || (5); // expected-warning {{use of logical '||' with constant operand}} \
// expected-note {{use '|' for a bitwise operation}}
return x && (0); // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
return x && (1); // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
return x && (-1); // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
return x && (5); // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
}
template<unsigned int A, unsigned int B> struct S
{
enum {
e1 = A && B,
e2 = A && 7 // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
e2 = A && 7 // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
};
int foo() {
int x = A && B;
int y = B && 3; // expected-warning {{use of logical && with constant operand; switch to bitwise & or remove constant}}
int y = B && 3; // expected-warning {{use of logical '&&' with constant operand}} \
// expected-note {{use '&' for a bitwise operation}} \
// expected-note {{remove constant to silence this warning}}
return x + y;
}