 +}
 Index: tools/clang/lib/Serialization/ASTReader.cpp
 ===================================================================
---- tools/clang/lib/Serialization/ASTReader.cpp	(revision 161724)
+--- tools/clang/lib/Serialization/ASTReader.cpp	(revision 162896)
 +++ tools/clang/lib/Serialization/ASTReader.cpp	(working copy)
-@@ -4930,6 +4930,9 @@
+@@ -4928,6 +4928,9 @@
          if (!ND)
            continue;
  

   void ClearFileInfo() {
Index: tools/clang/lib/Serialization/ASTReaderDecl.cpp
===================================================================
--- 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 D;
 }
 
@@ -2273,7 +2317,7 @@
   }
   MergedDeclsMap::iterator MergedPos = combineStoredMergedDecls(CanonDecl, ID);
   if (MergedPos != MergedDecls.end())
