aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Lex/ModuleMap.cpp
diff options
context:
space:
mode:
authorIlya Biryukov <ibiryukov@google.com>2018-11-02 10:50:26 +0000
committerIlya Biryukov <ibiryukov@google.com>2018-11-02 10:50:26 +0000
commitdfc56b43fadf5c4f84cdb8706f29ccf1ba68e5f1 (patch)
tree0bd6f725005d90565af782110bcfd14491692502 /clang/lib/Lex/ModuleMap.cpp
parent7d1b77df57fb6a14d2ef15f0e9123650ccee0cc4 (diff)
downloadllvm-dfc56b43fadf5c4f84cdb8706f29ccf1ba68e5f1.zip
llvm-dfc56b43fadf5c4f84cdb8706f29ccf1ba68e5f1.tar.gz
llvm-dfc56b43fadf5c4f84cdb8706f29ccf1ba68e5f1.tar.bz2
Revert "Fix regression in behavior of clang -x c++-header -fmodule-name=XXX"
This reverts commit r345803 and r345915 (a follow-up fix to r345803). Reason: r345803 blocks our internal integrate because of the new warnings showing up in too many places. The fix is actually correct, we will reland it after figuring out how to integrate properly. llvm-svn: 345963
Diffstat (limited to 'clang/lib/Lex/ModuleMap.cpp')
-rw-r--r--clang/lib/Lex/ModuleMap.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp
index 13d2b72..d44bf12 100644
--- a/clang/lib/Lex/ModuleMap.cpp
+++ b/clang/lib/Lex/ModuleMap.cpp
@@ -523,7 +523,7 @@ void ModuleMap::diagnoseHeaderInclusion(Module *RequestingModule,
// At this point, only non-modular includes remain.
- if (RequestingModule && LangOpts.ModulesStrictDeclUse) {
+ if (LangOpts.ModulesStrictDeclUse) {
Diags.Report(FilenameLoc, diag::err_undeclared_use_of_module)
<< RequestingModule->getTopLevelModule()->Name << Filename;
} else if (RequestingModule && RequestingModuleIsModuleInterface &&