    void ClearFileInfo() {
 Index: tools/clang/lib/Serialization/ASTReaderDecl.cpp
 ===================================================================
---- tools/clang/lib/Serialization/ASTReaderDecl.cpp	(revision 161724)
+--- tools/clang/lib/Serialization/ASTReaderDecl.cpp	(revision 162896)
 +++ tools/clang/lib/Serialization/ASTReaderDecl.cpp	(working copy)
 @@ -520,7 +520,9 @@
    FD->IsConstexpr = Record[Idx++];

   
   // Build up the list of redeclarations.
   RedeclChainVisitor Visitor(*this, SearchDecls, RedeclsDeserialized, CanonID);
@@ -2478,3 +2522,60 @@
     }
   }
 }

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