Change the Lexer ctor used in the non _Pragma case to take a FileID instead

of a SourceLocation.  This should speed it up and definitely simplifies it.

llvm-svn: 62422

1 files changed, 3 insertions, 9 deletions

diff --git a/clang/lib/Lex/PPLexerChange.cpp b/clang/lib/Lex/PPLexerChange.cpp
index cc8ccc4c107..60d42386d7a 100644
--- a/clang/lib/Lex/PPLexerChange.cpp
+++ b/clang/lib/Lex/PPLexerChange.cpp
@@ -74,16 +74,10 @@ void Preprocessor::EnterSourceFile(FileID FID, const DirectoryLookup *CurDir) {
     MaxIncludeStackDepth = IncludeMacroStack.size();
 
   if (PTH) {
-    PTHLexer *PL = PTH->CreateLexer(FID, SourceMgr.getFileEntryForID(FID));
-
-    if (PL) {
-      EnterSourceFileWithPTH(PL, CurDir);
-      return;
-    }
+    if (PTHLexer *PL = PTH->CreateLexer(FID, SourceMgr.getFileEntryForID(FID)))
+      return EnterSourceFileWithPTH(PL, CurDir);
   }
-  
-  Lexer *TheLexer = new Lexer(SourceMgr.getLocForStartOfFile(FID), *this);
-  EnterSourceFileWithLexer(TheLexer, CurDir);
+  EnterSourceFileWithLexer(new Lexer(FID, *this), CurDir);
 }  
 
 /// EnterSourceFileWithLexer - Add a source file to the top of the include stack