diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-01-17 08:03:42 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-01-17 08:03:42 +0000 |
| commit | 88d3ac1341aa016cabd966c5b113a95ac05ea43f (patch) | |
| tree | 23cce01273947a09ec132c439eb43eb925b1dca5 /lib/Lex/Lexer.cpp | |
| parent | 28c90ad7ef7c609a0b10c2f68b519ef69e7084d1 (diff) | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62422 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/Lexer.cpp')
| -rw-r--r-- | lib/Lex/Lexer.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp index c379f58b0c..772a4d9684 100644 --- a/lib/Lex/Lexer.cpp +++ b/lib/Lex/Lexer.cpp @@ -94,17 +94,12 @@ void Lexer::InitLexer(const char *BufStart, const char *BufPtr, /// with the specified preprocessor managing the lexing process. This lexer /// assumes that the associated file buffer and Preprocessor objects will /// outlive it, so it doesn't take ownership of either of them. -Lexer::Lexer(SourceLocation fileloc, Preprocessor &PP) -// FIXME: This is really horrible and only needed for _Pragma lexers, split this -// out of the main lexer path! -: PreprocessorLexer(&PP, - PP.getSourceManager().getCanonicalFileID( - PP.getSourceManager().getSpellingLoc(fileloc))), - FileLoc(fileloc), - Features(PP.getLangOptions()) { +Lexer::Lexer(FileID FID, Preprocessor &PP) + : PreprocessorLexer(&PP, FID), + FileLoc(PP.getSourceManager().getLocForStartOfFile(FID)), + Features(PP.getLangOptions()) { - SourceManager &SourceMgr = PP.getSourceManager(); - const llvm::MemoryBuffer *InputFile = SourceMgr.getBuffer(getFileID()); + const llvm::MemoryBuffer *InputFile = PP.getSourceManager().getBuffer(FID); InitLexer(InputFile->getBufferStart(), InputFile->getBufferStart(), InputFile->getBufferEnd()); @@ -124,7 +119,7 @@ Lexer::Lexer(SourceLocation fileloc, Preprocessor &PP, : PreprocessorLexer(&PP, PP.getSourceManager().getCanonicalFileID( PP.getSourceManager().getSpellingLoc(fileloc))), - FileLoc(fileloc), + FileLoc(fileloc), Features(PP.getLangOptions()) { InitLexer(PP.getSourceManager().getBuffer(getFileID())->getBufferStart(), |