maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

PR22299: Relocate code for handling -fmodule-map-file= so that we don't try to 

produce diagnostics with source locations before the diagnostics system is
ready for them.

llvm-svn: 226882
This commit is contained in:
Richard Smith 2015-01-23 00:01:13 +00:00
parent 5f715d36a7
commit ac425e9165
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/Frontend/CompilerInstance.cpp
View File

@ -371,14 +371,6 @@ void CompilerInstance::createPreprocessor(TranslationUnitKind TUKind) {
AttachHeaderIncludeGen(*PP, /*ShowAllHeaders=*/false, /*OutputPath=*/"",
/*ShowDepth=*/true, /*MSStyle=*/true);
}
// Load all explictly-specified module map files.
for (const auto &Filename : getFrontendOpts().ModuleMapFiles) {
if (auto *File = getFileManager().getFile(Filename))
PP->getHeaderSearchInfo().loadModuleMapFile(File, /*IsSystem*/false);
else
getDiagnostics().Report(diag::err_module_map_not_found) << Filename;
}
}
// ASTContext

9
clang/lib/Frontend/FrontendAction.cpp
View File

@ -383,6 +383,15 @@ bool FrontendAction::BeginSourceFile(CompilerInstance &CI,
"doesn't support modules");
}
// If we were asked to load any module map files, do so now.
for (const auto &Filename : CI.getFrontendOpts().ModuleMapFiles) {
if (auto *File = CI.getFileManager().getFile(Filename))
CI.getPreprocessor().getHeaderSearchInfo().loadModuleMapFile(
File, /*IsSystem*/false);
else
CI.getDiagnostics().Report(diag::err_module_map_not_found) << Filename;
}
// If we were asked to load any module files, do so now.
for (const auto &ModuleFile : CI.getFrontendOpts().ModuleFiles)
if (!CI.loadModuleFile(ModuleFile))

8
clang/test/Modules/diagnostics.modulemap Normal file
View File

@ -0,0 +1,8 @@
// RUN: cp %s %t-duplicate.modulemap
// RUN: not %clang_cc1 -fmodules -fmodules-cache-path=%t -fmodule-map-file=%s -fmodule-map-file=%t-duplicate.modulemap -fsyntax-only -x c++ /dev/null 2>&1 | FileCheck --check-prefix=CHECK-DUPLICATE %s
// PR22299: Ensure we can produce diagnostics for duplicate modules from -fmodule-map-file=.
//
// CHECK-DUPLICATE: duplicate.modulemap:[[@LINE+2]]:8: error: redefinition of module 'foo'
// CHECK-DUPLICATE: diagnostics.modulemap:[[@LINE+1]]:8: note: previously defined here
module foo {}