commit 2fe0997427d92388e66e7573f4b043e7ba285ef0
author Daniel Dunbar <daniel@zuster.org> Fri Sep 12 18:10:20 2008 +0000
committer Daniel Dunbar <daniel@zuster.org> Fri Sep 12 18:10:20 2008 +0000
tree 4bd997baeb9b15f973a2b4e5b0a43e675a209697
parent f1d80f12bb49a42098dfb1966a032c0951da30f4

Add --suppress-system-warnings (on by default, use =0 to disable)
 - For investigating warnings in system headers / builtins.
 - Currently also enables the behavior that allows silent redefinition
   of types in system headers. Conceptually these are separate but I
   didn't feel it was worth two options (or changing LangOptions).


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@56163 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Basic/Diagnostic.cpp

diff --git a/lib/Basic/Diagnostic.cpp b/lib/Basic/Diagnostic.cpp
index f9e1d2b..0f8f314 100644
--- a/lib/Basic/Diagnostic.cpp
+++ b/lib/Basic/Diagnostic.cpp
@@ -113,6 +113,7 @@
   WarningsAsErrors = false;
   WarnOnExtensions = false;
   ErrorOnExtensions = false;
+  SuppressSystemWarnings = false;
   // Clear all mappings, setting them to MAP_DEFAULT.
   memset(DiagMappings, 0, sizeof(DiagMappings));
   
@@ -224,7 +225,8 @@
   // have to check on the original DiagID here, because we also want to
   // ignore extensions and warnings in -Werror and -pedantic-errors modes,
   // which *map* warnings/extensions to errors.
-  if (DiagID < diag::NUM_BUILTIN_DIAGNOSTICS &&
+  if (SuppressSystemWarnings &&
+      DiagID < diag::NUM_BUILTIN_DIAGNOSTICS &&
       getBuiltinDiagClass(DiagID) != ERROR &&
       Loc.isValid() && Loc.isFileID() && Loc.isInSystemHeader())
     return;

lib/Sema/SemaDecl.cpp

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 7263723..2f43507 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -276,11 +276,13 @@
   // *either* declaration is in a system header. The code below implements
   // this adhoc compatibility rule. FIXME: The following code will not
   // work properly when compiling ".i" files (containing preprocessed output).
-  SourceManager &SrcMgr = Context.getSourceManager();
-  if (SrcMgr.isInSystemHeader(Old->getLocation()))
-    return New;
-  if (SrcMgr.isInSystemHeader(New->getLocation()))
-    return New;
+  if (PP.getDiagnostics().getSuppressSystemWarnings()) {
+    SourceManager &SrcMgr = Context.getSourceManager();
+    if (SrcMgr.isInSystemHeader(Old->getLocation()))
+      return New;
+    if (SrcMgr.isInSystemHeader(New->getLocation()))
+      return New;
+  }
 
   Diag(New->getLocation(), diag::err_redefinition, New->getName());
   Diag(Old->getLocation(), diag::err_previous_definition);