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

         return FindExistingResult(Reader, D, *I);
     }
   }
@@ -1787,7 +1810,9 @@
   if (DC->isNamespace()) {
     for (DeclContext::lookup_result R = DC->lookup(Name);
          R.first != R.second; ++R.first) {

         return FindExistingResult(Reader, D, *R.first);
     }
   }
@@ -1798,22 +1814,41 @@
 void ASTDeclReader::attachPreviousDecl(Decl *D, Decl *previous) {
   assert(D && previous);
   if (TagDecl *TD = dyn_cast<TagDecl>(D)) {
