diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2018-11-05 12:46:02 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2018-11-05 12:46:02 +0000 |
| commit | 5904c41ed26dd1031acb0dbc991c3fd272ceb21f (patch) | |
| tree | f4b460339416b1717630eda20bc8e71b8a1a8c6f /clang/lib/Lex/ModuleMap.cpp | |
| parent | 5f60861be706191866341c52b6ce5bbcb1c024ed (diff) | |
| download | bcm5719-llvm-5904c41ed26dd1031acb0dbc991c3fd272ceb21f.tar.gz bcm5719-llvm-5904c41ed26dd1031acb0dbc991c3fd272ceb21f.zip | |
Reapply "Fix regression in behavior of clang -x c++-header -fmodule-name=XXX"
This reverts commit r345963. We have a path forward now.
Original commit message:
The driver accidentally stopped passing the input filenames on to -cc1
in this mode due to confusion over what action was being requested.
This change also fixes a couple of crashes I encountered when passing
multiple files to such a -cc1 invocation.
llvm-svn: 346130
Diffstat (limited to 'clang/lib/Lex/ModuleMap.cpp')
| -rw-r--r-- | clang/lib/Lex/ModuleMap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp index d44bf124ffc..13d2b728f58 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 (LangOpts.ModulesStrictDeclUse) { + if (RequestingModule && LangOpts.ModulesStrictDeclUse) { Diags.Report(FilenameLoc, diag::err_undeclared_use_of_module) << RequestingModule->getTopLevelModule()->Name << Filename; } else if (RequestingModule && RequestingModuleIsModuleInterface && |
