diff options
Diffstat (limited to 'clang/lib/Frontend/CompilerInstance.cpp')
| -rw-r--r-- | clang/lib/Frontend/CompilerInstance.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp index 0c5a1fa70aa..ce6572aa1be 100644 --- a/clang/lib/Frontend/CompilerInstance.cpp +++ b/clang/lib/Frontend/CompilerInstance.cpp @@ -996,7 +996,8 @@ CompilerInstance::loadModule(SourceLocation ImportLoc, BuildingModule = true; compileModule(*this, ModuleNameLoc, Module, ModuleFileName); - ModuleFile = FileMgr->getFile(ModuleFileName); + ModuleFile = FileMgr->getFile(ModuleFileName, /*OpenFile=*/false, + /*CacheFailure=*/false); if (!ModuleFile && getPreprocessorOpts().FailedModules) getPreprocessorOpts().FailedModules->addFailed(ModuleName); @@ -1079,14 +1080,14 @@ CompilerInstance::loadModule(SourceLocation ImportLoc, << ModuleName << SourceRange(ImportLoc, ModuleNameLoc); ModuleBuildFailed = true; - return ModuleLoadResult(); } compileModule(*this, ModuleNameLoc, Module, ModuleFileName); // Try loading the module again. - ModuleFile = FileMgr->getFile(ModuleFileName); + ModuleFile = FileMgr->getFile(ModuleFileName, /*OpenFile=*/false, + /*CacheFailure=*/false); if (!ModuleFile || ModuleManager->ReadAST(ModuleFileName, serialization::MK_Module, ImportLoc, |
