2 files changed, 11 insertions, 19 deletions
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index ccdf3fe10ae..31b649f16e1 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -3430,6 +3430,9 @@ ASTReader::ASTReadResult ASTReader::ReadAST(const std::string &FileName,
   llvm::SaveAndRestore<SourceLocation>
     SetCurImportLocRAII(CurrentImportLoc, ImportLoc);
 
+  // Defer any pending actions until we get to the end of reading the AST file.
+  Deserializing AnASTFile(this);
+
   // Bump the generation number.
   unsigned PreviousGeneration = CurrentGeneration++;
 
@@ -3742,24 +3745,6 @@ void ASTReader::InitializeContext() {
     DeserializationListener->DeclRead(PREDEF_DECL_TRANSLATION_UNIT_ID, 
                                       Context.getTranslationUnitDecl());
 
-  // For any declarations we have already loaded, load any update records.
-  {
-    // We're not back to a consistent state until all our pending update
-    // records have been loaded. There can be interdependencies between them.
-    Deserializing SomeUpdateRecords(this);
-    ReadingKindTracker ReadingKind(Read_Decl, *this);
-
-    // Make sure we load the declaration update records for the translation
-    // unit, if there are any.
-    // FIXME: Is this necessary any more?
-    loadDeclUpdateRecords(PREDEF_DECL_TRANSLATION_UNIT_ID,
-                          Context.getTranslationUnitDecl());
-
-    for (auto &Update : PendingUpdateRecords)
-      loadDeclUpdateRecords(Update.first, Update.second);
-    PendingUpdateRecords.clear();
-  }
-
   // FIXME: Find a better way to deal with collisions between these
   // built-in types. Right now, we just ignore the problem.
   
@@ -8057,6 +8042,13 @@ void ASTReader::finishPendingActions() {
       Info.D->setDeclContextsImpl(SemaDC, LexicalDC, getContext());
     }
 
+    // Perform any pending declaration updates.
+    while (!PendingUpdateRecords.empty()) {
+      auto Update = PendingUpdateRecords.pop_back_val();
+      ReadingKindTracker ReadingKind(Read_Decl, *this);
+      loadDeclUpdateRecords(Update.first, Update.second);
+    }
+
     // Trigger the import of the full definition of each class that had any
     // odr-merging problems, so we can produce better diagnostics for them.
     for (auto &Merge : PendingOdrMergeFailures) {
diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp
index 96253ca301f..5f1d65f8eb1 100644
--- a/clang/lib/Serialization/ASTReaderDecl.cpp
+++ b/clang/lib/Serialization/ASTReaderDecl.cpp
@@ -2801,7 +2801,7 @@ Decl *ASTReader::ReadDeclRecord(DeclID ID) {
   assert(Idx == Record.size());
 
   // Load any relevant update records.
-  loadDeclUpdateRecords(ID, D);
+  PendingUpdateRecords.push_back(std::make_pair(ID, D));
 
   // Load the categories after recursive loading is finished.
   if (ObjCInterfaceDecl *Class = dyn_cast<ObjCInterfaceDecl>(D))