commit 15ab37321cbdb8c38e30cf8bd59bad52f4497580
author Alp Toker <alp@nuanti.com> Thu Dec 12 12:47:48 2013 +0000
committer Alp Toker <alp@nuanti.com> Thu Dec 12 12:47:48 2013 +0000
tree 897707cf5b3afb4f68abeb222e30c3ef17892931
parent cb5beb347a0c059b5b659799c904c9d6f6ad14f3

Suppress -Wshadow / -Wold-style-cast expanded from system header macros

Thanks to Jonathan Sauer for providing initial test cases.

Fixes PR16093 and PR18147.

llvm-svn: 197150

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index cd28c22..aa2104e 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -5599,6 +5599,8 @@
   DeclarationName Name = R.getLookupName();
 
   // Emit warning and note.
+  if (getSourceManager().isInSystemMacro(R.getNameLoc()))
+    return;
   Diag(R.getNameLoc(), diag::warn_decl_shadow) << Name << Kind << OldDC;
   Diag(ShadowedDecl->getLocation(), diag::note_previous_declaration);
 }

clang/lib/Sema/SemaExpr.cpp

diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 66ca9d4..d1e3c1f 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -5143,9 +5143,9 @@
     CastExpr = Result.take();
   }
 
-  if (getLangOpts().CPlusPlus && !castType->isVoidType())
-    Diag(CastExpr->getLocStart(), diag::warn_old_style_cast)
-        << SourceRange(LParenLoc, RParenLoc);
+  if (getLangOpts().CPlusPlus && !castType->isVoidType() &&
+      !getSourceManager().isInSystemMacro(LParenLoc))
+    Diag(LParenLoc, diag::warn_old_style_cast) << CastExpr->getSourceRange();
 
   return BuildCStyleCastExpr(LParenLoc, castTInfo, RParenLoc, CastExpr);
 }