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

   /// This routine should only be used for fatal errors that have to
Index: tools/clang/include/clang/Lex/HeaderSearch.h
===================================================================
--- tools/clang/include/clang/Lex/HeaderSearch.h	(revision 161655)
+++ tools/clang/include/clang/Lex/HeaderSearch.h	(working copy)
@@ -283,6 +283,11 @@
   

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