    }
  }
  
-@@ -1779,7 +1802,7 @@
+@@ -1779,7 +1793,7 @@
      for (IdentifierResolver::iterator I = IdResolver.begin(Name), 
                                     IEnd = IdResolver.end();
           I != IEnd; ++I) {

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

   /// 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 161724)
+++ tools/clang/include/clang/Lex/HeaderSearch.h	(working copy)
@@ -283,6 +283,11 @@
   
