commit 0f2b4635be504a7c82c90bc4669e8513c006a648
author Douglas Gregor <dgregor@apple.com> Thu Jan 10 02:04:18 2013 +0000
committer Douglas Gregor <dgregor@apple.com> Thu Jan 10 02:04:18 2013 +0000
tree f0ee837a624e57c6a276e75bb35939995d6448b3
parent a6cb018bb59ca9b90ce8e3dbed9060448037b2b0

Be more careful about updating the failed-modules set

llvm-svn: 172035

clang/lib/Frontend/CompilerInstance.cpp

diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp
index ecc2965..f31301c 100644
--- a/clang/lib/Frontend/CompilerInstance.cpp
+++ b/clang/lib/Frontend/CompilerInstance.cpp
@@ -982,7 +982,7 @@
       compileModule(*this, ModuleNameLoc, Module, ModuleFileName);
       ModuleFile = FileMgr->getFile(ModuleFileName);
 
-      if (!ModuleFile)
+      if (!ModuleFile && getPreprocessorOpts().FailedModules)
         getPreprocessorOpts().FailedModules->addFailed(ModuleName);
     }
 
@@ -1057,7 +1057,8 @@
           ModuleManager->ReadAST(ModuleFileName,
                                  serialization::MK_Module, ImportLoc,
                                  ASTReader::ARR_None) != ASTReader::Success) {
-        getPreprocessorOpts().FailedModules->addFailed(ModuleName);
+        if (getPreprocessorOpts().FailedModules)
+          getPreprocessorOpts().FailedModules->addFailed(ModuleName);
         KnownModules[Path[0].first] = 0;
         return ModuleLoadResult();
       }