          if (ND->getDeclName() != This->Name) {
            assert(!This->Name.getCXXNameType().isNull() && 
                   "Name mismatch without a type");
-@@ -5571,7 +5574,11 @@
+@@ -5569,7 +5572,11 @@
      ValueDecl *D = cast<ValueDecl>(GetDecl(PendingInstantiations[Idx++]));
      SourceLocation Loc
        = SourceLocation::getFromRawEncoding(PendingInstantiations[Idx++]);

   return D;
 }
 
@@ -2275,7 +2319,7 @@
   }
   MergedDeclsMap::iterator MergedPos = combineStoredMergedDecls(CanonDecl, ID);
   if (MergedPos != MergedDecls.end())

   }  
   PendingInstantiations.clear();
 }
@@ -6466,6 +6473,9 @@
 }
 
 ASTReader::~ASTReader() {
