commit f056d92e182cbe4f62c8d14102544dc38066dabc
author Chris Lattner <sabre@nondot.org> Sat Jan 17 08:06:50 2009 +0000
committer Chris Lattner <sabre@nondot.org> Sat Jan 17 08:06:50 2009 +0000
tree d3ee1ce1e41e88a689a7cdf25020f476d88207fc
parent 88d3ac1341aa016cabd966c5b113a95ac05ea43f

simplify PTHManager::CreateLexer


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62424 91177308-0d34-0410-b5e6-96231b3b80d8

include/clang/Lex/PTHManager.h

diff --git a/include/clang/Lex/PTHManager.h b/include/clang/Lex/PTHManager.h
index c4ecfd6..67e3666 100644
--- a/include/clang/Lex/PTHManager.h
+++ b/include/clang/Lex/PTHManager.h
@@ -128,7 +128,7 @@
   /// CreateLexer - Return a PTHLexer that "lexes" the cached tokens for the
   ///  specified file.  This method returns NULL if no cached tokens exist.
   ///  It is the responsibility of the caller to 'delete' the returned object.
-  PTHLexer *CreateLexer(FileID FID, const FileEntry *FE);
+  PTHLexer *CreateLexer(FileID FID);
   
   unsigned getSpelling(SourceLocation Loc, const char *&Buffer);  
 private:

lib/Lex/PPLexerChange.cpp

diff --git a/lib/Lex/PPLexerChange.cpp b/lib/Lex/PPLexerChange.cpp
index 60d4238..f8c8636 100644
--- a/lib/Lex/PPLexerChange.cpp
+++ b/lib/Lex/PPLexerChange.cpp
@@ -74,7 +74,7 @@
     MaxIncludeStackDepth = IncludeMacroStack.size();
 
   if (PTH) {
-    if (PTHLexer *PL = PTH->CreateLexer(FID, SourceMgr.getFileEntryForID(FID)))
+    if (PTHLexer *PL = PTH->CreateLexer(FID))
       return EnterSourceFileWithPTH(PL, CurDir);
   }
   EnterSourceFileWithLexer(new Lexer(FID, *this), CurDir);

lib/Lex/PTHLexer.cpp

diff --git a/lib/Lex/PTHLexer.cpp b/lib/Lex/PTHLexer.cpp
index fd7c367..12f8330 100644
--- a/lib/Lex/PTHLexer.cpp
+++ b/lib/Lex/PTHLexer.cpp
@@ -668,7 +668,8 @@
 }
 
 
-PTHLexer* PTHManager::CreateLexer(FileID FID, const FileEntry* FE) {
+PTHLexer *PTHManager::CreateLexer(FileID FID) {
+  const FileEntry *FE = PP->getSourceManager().getFileEntryForID(FID);
   if (!FE)
     return 0;