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

Eagerly resolve the spelling location of the tokens in a definition 

of a macro.  Since these tokens may themselves be from macro 
expansions, we need to resolve down to the spelling loc when the
macro ends up being instantiated.  Instead of resolving this for
each token expanded from the macro definition, just do it once when
the macro is defined.  This speeds up clang on c99-intconst-1.c from
2.66s to 2.43s (9.5%), reducing the FileID lookups from 407244 linear and
114175649 binary to 2529040 linear and 64771121 binary.

llvm-svn: 62993
This commit is contained in:
Chris Lattner 2009-01-26 04:06:48 +00:00
parent dd9babc79a
commit 5a5d67101b
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -991,6 +991,12 @@ void Preprocessor::HandleDefineDirective(Token &DefineTok) {
if (MI->isObjectLike()) {
// Object-like macros are very simple, just read their body.
while (Tok.isNot(tok::eom)) {
// If this token has a virtual location, resolve it down to its spelling
// location. This is not strictly needed, but avoids extra resolutions
// for macros that are expanded frequently.
if (!Tok.getLocation().isFileID())
Tok.setLocation(SourceMgr.getSpellingLoc(Tok.getLocation()));
MI->AddTokenToBody(Tok);
// Get the next token of the macro.
LexUnexpandedToken(Tok);
@ -1000,6 +1006,12 @@ void Preprocessor::HandleDefineDirective(Token &DefineTok) {
// Otherwise, read the body of a function-like macro. This has to validate
// the # (stringize) operator.
while (Tok.isNot(tok::eom)) {
// If this token has a virtual location, resolve it down to its spelling
// location. This is not strictly needed, but avoids extra resolutions
// for macros that are expanded frequently.
if (!Tok.getLocation().isFileID())
Tok.setLocation(SourceMgr.getSpellingLoc(Tok.getLocation()));
MI->AddTokenToBody(Tok);
// Check C99 6.10.3.2p1: ensure that # operators are followed by macro

6
clang/lib/Lex/PPMacroExpansion.cpp
View File

@ -340,6 +340,12 @@ MacroArgs *Preprocessor::ReadFunctionLikeMacroArgs(Token &MacroName,
if (!MI->isEnabled())
Tok.setFlag(Token::DisableExpand);
}
// If this token has instantiation location, resolve it down to its
// spelling location. This is not strictly needed, but avoids extra
// resolutions for macros that are expanded frequently.
if (!Tok.getLocation().isFileID())
Tok.setLocation(SourceMgr.getSpellingLoc(Tok.getLocation()));
ArgTokens.push_back(Tok);
}