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

   void ClearFileInfo() {
Index: tools/clang/include/clang/Serialization/ASTReader.h
===================================================================
--- tools/clang/include/clang/Serialization/ASTReader.h	(revision 160726)
+++ tools/clang/include/clang/Serialization/ASTReader.h	(working copy)
@@ -686,7 +686,15 @@
   /// need to be emitted, such as inline function definitions or

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