2 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp
index 43df71a2cc8..1d4d85a8973 100644
--- a/clang/lib/Lex/PPMacroExpansion.cpp
+++ b/clang/lib/Lex/PPMacroExpansion.cpp
@@ -148,7 +148,7 @@ bool Preprocessor::HandleMacroExpandedIdentifier(Token &Identifier,
   // If this is a macro exapnsion in the "#if !defined(x)" line for the file,
   // then the macro could expand to different things in other contexts, we need
   // to disable the optimization in this case.
-  if (CurLexer) CurLexer->MIOpt.ExpandedMacro();
+  if (CurPPLexer) CurPPLexer->MIOpt.ExpandedMacro();
   
   // If this is a builtin macro, like __LINE__ or _Pragma, handle it specially.
   if (MI->isBuiltinMacro()) {
diff --git a/clang/lib/Lex/Pragma.cpp b/clang/lib/Lex/Pragma.cpp
index 6d8e047056d..cc224dd8d94 100644
--- a/clang/lib/Lex/Pragma.cpp
+++ b/clang/lib/Lex/Pragma.cpp
@@ -89,7 +89,7 @@ void Preprocessor::HandlePragmaDirective() {
   PragmaHandlers->HandlePragma(*this, Tok);
   
   // If the pragma handler didn't read the rest of the line, consume it now.
-  if (CurLexer->ParsingPreprocessorDirective)
+  if (CurPPLexer->ParsingPreprocessorDirective)
     DiscardUntilEndOfDirective();
 }
 
@@ -203,9 +203,9 @@ void Preprocessor::HandlePragmaPoison(Token &PoisonTok) {
     // This avoids errors on code like:
     //   #pragma GCC poison X
     //   #pragma GCC poison X
-    if (CurLexer) CurLexer->LexingRawMode = true;
+    if (CurPPLexer) CurPPLexer->LexingRawMode = true;
     LexUnexpandedToken(Tok);
-    if (CurLexer) CurLexer->LexingRawMode = false;
+    if (CurPPLexer) CurPPLexer->LexingRawMode = false;
     
     // If we reached the end of line, we're done.
     if (Tok.is(tok::eom)) return;
@@ -257,7 +257,7 @@ void Preprocessor::HandlePragmaSystemHeader(Token &SysHeaderTok) {
 ///
 void Preprocessor::HandlePragmaDependency(Token &DependencyTok) {
   Token FilenameTok;
-  CurLexer->LexIncludeFilename(FilenameTok);
+  CurPPLexer->LexIncludeFilename(FilenameTok);
 
   // If the token kind is EOM, the error has already been diagnosed.
   if (FilenameTok.is(tok::eom))