Remove -Wnon-modular-include

But keep -Wnon-modular-include-in-[framework-]module

This warning is too noisy and doesn't really indicate a problem for most
people.  Even though it would only really affect people using
-Weverything, that seems bad so remove it.

llvm-svn: 208345

4 files changed, 1 insertions, 18 deletions

diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td
index a2cc7406aba..b1243cfabd8 100644
--- a/clang/include/clang/Basic/DiagnosticGroups.td
+++ b/clang/include/clang/Basic/DiagnosticGroups.td
@@ -190,8 +190,6 @@ def NonModularIncludeInFrameworkModule
   : DiagGroup<"non-modular-include-in-framework-module">;
 def NonModularIncludeInModule : DiagGroup<"non-modular-include-in-module",
                                           [NonModularIncludeInFrameworkModule]>;
-def NonModularInclude : DiagGroup<"non-modular-include",
-                                  [NonModularIncludeInModule]>;
 def InvalidNoreturn : DiagGroup<"invalid-noreturn">;
 def InvalidSourceEncoding : DiagGroup<"invalid-source-encoding">;
 def KNRPromotedParameter : DiagGroup<"knr-promoted-parameter">;
diff --git a/clang/include/clang/Basic/DiagnosticLexKinds.td b/clang/include/clang/Basic/DiagnosticLexKinds.td
index abd386fc368..6240ce0705a 100644
--- a/clang/include/clang/Basic/DiagnosticLexKinds.td
+++ b/clang/include/clang/Basic/DiagnosticLexKinds.td
@@ -626,8 +626,7 @@ def warn_non_modular_include_in_framework_module : Warning<
 def warn_non_modular_include_in_module : Warning<
   "include of non-modular header inside module '%0'">,
   InGroup<NonModularIncludeInModule>, DefaultIgnore;
-def warn_non_modular_include : Warning<
-  "include of non-modular header">, InGroup<NonModularInclude>, DefaultIgnore;
+
 
 def warn_header_guard : Warning<
   "%0 is used as a header guard here, followed by #define of a different macro">,
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp
index f89d91d0568..ce2c4f02e39 100644
--- a/clang/lib/Lex/ModuleMap.cpp
+++ b/clang/lib/Lex/ModuleMap.cpp
@@ -310,8 +310,6 @@ void ModuleMap::diagnoseHeaderInclusion(Module *RequestingModule,
         diag::warn_non_modular_include_in_framework_module :
         diag::warn_non_modular_include_in_module;
     Diags.Report(FilenameLoc, DiagID) << RequestingModule->getFullModuleName();
-  } else {
-    Diags.Report(FilenameLoc, diag::warn_non_modular_include);
   }
 }
 
diff --git a/clang/test/Modules/require-modular-includes.m b/clang/test/Modules/require-modular-includes.m
index 55674319ff4..835a3524339 100644
--- a/clang/test/Modules/require-modular-includes.m
+++ b/clang/test/Modules/require-modular-includes.m
@@ -40,12 +40,6 @@
 // RUN:     -fmodules-cache-path=%t -I %S/Inputs/require-modular-includes \
 // RUN:     -Werror -fmodule-name=A -fsyntax-only -x objective-c -
 
-// Including a non-modular header (directly) with -Wnon-modular-include
-// RUN: echo '#include "NotInModule.h"' | \
-// RUN:   %clang_cc1 -Wnon-modular-include -fmodules \
-// RUN:     -fmodules-cache-path=%t -I %S/Inputs/require-modular-includes \
-// RUN:     -fmodule-name=A -fsyntax-only -x objective-c - 2>&1 | FileCheck %s
-
 // Including an excluded header
 // RUN: echo '@import IncludeExcluded;' | \
 // RUN:   %clang_cc1 -Wnon-modular-include-in-framework-module -fmodules \
@@ -86,10 +80,4 @@
 // RUN:     -fmodules-cache-path=%t -I %S/Inputs/require-modular-includes \
 // RUN:     -Werror -fsyntax-only -x objective-c -
 
-// Non-framework module (fail)
-// RUN: echo '@import NotFramework;' | \
-// RUN:   not %clang_cc1 -Werror=non-modular-include -fmodules \
-// RUN:     -fmodules-cache-path=%t -I %S/Inputs/require-modular-includes \
-// RUN:     -fsyntax-only -x objective-c - 2>&1 | FileCheck %s
-
 // CHECK: include of non-modular header