commit 0ac1b8fd076f5ca936f8424b673717fa1c143a83
author Richard Smith <richard-llvm@metafoo.co.uk> Sat Mar 22 01:43:32 2014 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Sat Mar 22 01:43:32 2014 +0000
tree 5467963c4bcc53a416926adb8d1938371da9469b
parent 7dabe1a1b651316d1097043c914233da948e19ce

Refactor: move loading pending instantiations from chained PCHs to a more appropriate place, so that we only ask the external source once.

llvm-svn: 204535

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 029f9a2..376f6f7 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -3439,6 +3439,8 @@
 
     PerformDependentDiagnostics(PatternDecl, TemplateArgs);
 
+    // FIXME: Notify the ASTMutationListener that we did this.
+
     savedContext.pop();
   }
 
@@ -4592,14 +4594,6 @@
 /// \brief Performs template instantiation for all implicit template
 /// instantiations we have seen until this point.
 void Sema::PerformPendingInstantiations(bool LocalOnly) {
-  // Load pending instantiations from the external source.
-  if (!LocalOnly && ExternalSource) {
-    SmallVector<PendingImplicitInstantiation, 4> Pending;
-    ExternalSource->ReadPendingInstantiations(Pending);
-    PendingInstantiations.insert(PendingInstantiations.begin(),
-                                 Pending.begin(), Pending.end());
-  }
-
   while (!PendingLocalImplicitInstantiations.empty() ||
          (!LocalOnly && !PendingInstantiations.empty())) {
     PendingImplicitInstantiation Inst;