commit ed2fc2a311065ee5f6c20adb1655702aff86ae8a
author Douglas Gregor <dgregor@apple.com> Fri Mar 22 21:26:48 2013 +0000
committer Douglas Gregor <dgregor@apple.com> Fri Mar 22 21:26:48 2013 +0000
tree 14442f7ae068fd5e00be0ceeca526d961a6468fe
parent 0f3a34fb7fea37ebfbcba8b400ccb697b9559b49

<rdar://problem/13479539> Only rebuild the global module cache when we're allowed to.

This eliminates excessive rebuilds of the global module cache.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177766 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Frontend/CompilerInstance.cpp

diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp
index 633f3c5..f83c870 100644
--- a/lib/Frontend/CompilerInstance.cpp
+++ b/lib/Frontend/CompilerInstance.cpp
@@ -62,7 +62,8 @@
 
 bool CompilerInstance::shouldBuildGlobalModuleIndex() const {
   return (BuildGlobalModuleIndex ||
-          (ModuleManager && ModuleManager->isGlobalIndexUnavailable())) &&
+          (ModuleManager && ModuleManager->isGlobalIndexUnavailable() &&
+           getFrontendOpts().GenerateGlobalModuleIndex)) &&
          !ModuleBuildFailed;
 }