1 files changed, 12 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());
+      }
     }
 }