commit 8d4e90b3197fc36a1a7c0fcad96e13f1f1f93029
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Mar 14 17:52:37 2016 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Mar 14 17:52:37 2016 +0000
tree 67f664e05cefef64ad41486d53c89591696a6ad2
parent 57195841291c581146cf0890172c69b066d0ec6f

[modules] Don't diagnose non-modular includes from modular files that are
implementation units of modules rather than interface units.

llvm-svn: 263449

clang/lib/Lex/ModuleMap.cpp

diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp
index 5e103a0..69cb574 100644
--- a/clang/lib/Lex/ModuleMap.cpp
+++ b/clang/lib/Lex/ModuleMap.cpp
@@ -239,6 +239,7 @@
 }
 
 void ModuleMap::diagnoseHeaderInclusion(Module *RequestingModule,
+                                        bool RequestingModuleIsModuleInterface,
                                         SourceLocation FilenameLoc,
                                         StringRef Filename,
                                         const FileEntry *File) {
@@ -301,7 +302,7 @@
   if (LangOpts.ModulesStrictDeclUse) {
     Diags.Report(FilenameLoc, diag::err_undeclared_use_of_module)
         << RequestingModule->getFullModuleName() << Filename;
-  } else if (RequestingModule) {
+  } else if (RequestingModule && RequestingModuleIsModuleInterface) {
     diag::kind DiagID = RequestingModule->getTopLevelModule()->IsFramework ?
         diag::warn_non_modular_include_in_framework_module :
         diag::warn_non_modular_include_in_module;