 -                           bool DelayInitialization)
 +                           bool DelayInitialization,
 +                           bool IncrProcessing)
-   : Diags(&diags), Features(opts), Target(target),FileMgr(Headers.getFileMgr()),
+   : Diags(&diags), LangOpts(opts), Target(target),FileMgr(Headers.getFileMgr()),
      SourceMgr(SM), HeaderInfo(Headers), TheModuleLoader(TheModuleLoader),
 -    ExternalSource(0), 
 -    Identifiers(opts, IILookup), CodeComplete(0),

   for (WarnUnusedMacroLocsTy::iterator
Index: tools/clang/lib/Lex/Preprocessor.cpp
===================================================================
--- tools/clang/lib/Lex/Preprocessor.cpp	(revision 152030)
+++ tools/clang/lib/Lex/Preprocessor.cpp	(working copy)
@@ -54,18 +54,19 @@
                            HeaderSearch &Headers, ModuleLoader &TheModuleLoader,

Index: tools/clang/include/clang/Lex/Preprocessor.h
===================================================================
--- tools/clang/include/clang/Lex/Preprocessor.h	(revision 152550)
+++ tools/clang/include/clang/Lex/Preprocessor.h	(working copy)
@@ -148,6 +148,10 @@
   /// with this preprocessor.
