replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add hooks to use PTHLexer::Lex instead of Lexer::Lex when CurLexer is null. 

Performance tests on Cocoa.h (using the regular Lexer) shows no performance
difference.

llvm-svn: 59479
This commit is contained in:
Ted Kremenek 2008-11-18 01:04:47 +00:00
parent e2c23daa14
commit 6b73291462
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Lex/Preprocessor.h
View File

@ -330,6 +330,8 @@ public:
void Lex(Token &Result) { void Lex(Token &Result) {
if (CurLexer) if (CurLexer)
CurLexer->Lex(Result); CurLexer->Lex(Result);
else if (CurPTHLexer)
CurPTHLexer->Lex(Result);
else if (CurTokenLexer) else if (CurTokenLexer)
CurTokenLexer->Lex(Result); CurTokenLexer->Lex(Result);
else else

8
clang/lib/Lex/PPDirectives.cpp
View File

@ -115,8 +115,7 @@ void Preprocessor::SkipExcludedConditionalBlock(SourceLocation IfTokenLoc,
bool FoundNonSkipPortion, bool FoundNonSkipPortion,
bool FoundElse) { bool FoundElse) {
++NumSkipped; ++NumSkipped;
assert(CurTokenLexer == 0 && CurLexer && assert(CurTokenLexer == 0 && CurPPLexer && "Lexing a macro, not a file?");
"Lexing a macro, not a file?");
CurPPLexer->pushConditionalLevel(IfTokenLoc, /*isSkipping*/false, CurPPLexer->pushConditionalLevel(IfTokenLoc, /*isSkipping*/false,
FoundNonSkipPortion, FoundElse); FoundNonSkipPortion, FoundElse);
@ -126,7 +125,10 @@ void Preprocessor::SkipExcludedConditionalBlock(SourceLocation IfTokenLoc,
CurPPLexer->LexingRawMode = true; CurPPLexer->LexingRawMode = true;
Token Tok; Token Tok;
while (1) { while (1) {
CurLexer->Lex(Tok); if (CurLexer)
CurLexer->Lex(Tok);
else
CurPTHLexer->Lex(Tok);
// If this is the end of the buffer, we have an error. // If this is the end of the buffer, we have an error.
if (Tok.is(tok::eof)) { if (Tok.is(tok::eof)) {