diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 21 | ||||
| -rw-r--r-- | test/SemaCXX/warn-assignment-condition.cpp | 10 |
2 files changed, 22 insertions, 9 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 6fe111fac7..ab190276af 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -9240,15 +9240,18 @@ void Sema::DiagnoseEqualityWithExtraParens(ParenExpr *parenE) { opE->getLHS()->IgnoreParenImpCasts()->isModifiableLvalue(Context) == Expr::MLV_Valid) { SourceLocation Loc = opE->getOperatorLoc(); - - Diag(Loc, diag::warn_equality_with_extra_parens) << E->getSourceRange(); - - Diag(Loc, diag::note_equality_comparison_to_assign) - << FixItHint::CreateReplacement(Loc, "="); - - Diag(Loc, diag::note_equality_comparison_silence) - << FixItHint::CreateRemoval(parenE->getSourceRange().getBegin()) - << FixItHint::CreateRemoval(parenE->getSourceRange().getEnd()); + + // Don't emit a warning if the operation occurs within a macro. + // Sometimes extra parentheses are used within macros to make the + // instantiation of the macro less error prone. + if (!Loc.isMacroID()) { + Diag(Loc, diag::warn_equality_with_extra_parens) << E->getSourceRange(); + Diag(Loc, diag::note_equality_comparison_to_assign) + << FixItHint::CreateReplacement(Loc, "="); + Diag(Loc, diag::note_equality_comparison_silence) + << FixItHint::CreateRemoval(parenE->getSourceRange().getBegin()) + << FixItHint::CreateRemoval(parenE->getSourceRange().getEnd()); + } } } diff --git a/test/SemaCXX/warn-assignment-condition.cpp b/test/SemaCXX/warn-assignment-condition.cpp index 7596bb26ae..ab9d2ad4a5 100644 --- a/test/SemaCXX/warn-assignment-condition.cpp +++ b/test/SemaCXX/warn-assignment-condition.cpp @@ -124,3 +124,13 @@ void test2() { // expected-note {{remove extraneous parentheses around the comparison to silence this warning}} if ((test2 == fn)) {} } + +// Do not warn about extra '()' used within a macro. This pattern +// occurs frequently. +#define COMPARE(x,y) (x == y) +int test3(int x, int y) { + if (COMPARE(x, y)) // no-warning + return 0; + return 1; +} + |