nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR21217: Slightly more eagerly load -fmodule-map-file= files and provide

Browse Source 
diagnostics if they don't exist. Based on a patch by John Thompson!

llvm-svn: 223561
This commit is contained in:
Richard Smith
2014-12-06 01:13:41 +00:00
parent ceeb74e606
commit 4a89a06d0d
5 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Frontend/CompilerInvocation.cpp
View File

@@ -848,6 +848,7 @@ static InputKind ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
Opts.ASTDumpLookups = Args.hasArg(OPT_ast_dump_lookups);
Opts.UseGlobalModuleIndex = !Args.hasArg(OPT_fno_modules_global_index);
Opts.GenerateGlobalModuleIndex = Opts.UseGlobalModuleIndex;
Opts.ModuleMapFiles = Args.getAllArgValues(OPT_fmodule_map_file);
Opts.ModuleFiles = Args.getAllArgValues(OPT_fmodule_file);
Opts.CodeCompleteOpts.IncludeMacros
@@ -1019,9 +1020,6 @@ static void ParseHeaderSearchArgs(HeaderSearchOptions &Opts, ArgList &Args) {
StringRef MacroDef = (*it)->getValue();
Opts.ModulesIgnoreMacros.insert(MacroDef.split('=').first);
}
std::vector<std::string> ModuleMapFiles =
Args.getAllArgValues(OPT_fmodule_map_file);
Opts.ModuleMapFiles.insert(ModuleMapFiles.begin(), ModuleMapFiles.end());
// Add -I..., -F..., and -index-header-map options in order.
bool IsIndexHeaderMap = false;