From 5a5d67101b71577a89a1a3ee89f1b85994d83304 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 26 Jan 2009 04:06:48 +0000 Subject: 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 --- clang/lib/Lex/PPDirectives.cpp | 12 ++++++++++++ clang/lib/Lex/PPMacroExpansion.cpp | 6 ++++++ 2 files changed, 18 insertions(+) (limited to 'clang') diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp index ef26aeb79a6..ec5b67fb788 100644 --- a/clang/lib/Lex/PPDirectives.cpp +++ b/clang/lib/Lex/PPDirectives.cpp @@ -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 diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp index 63caafaf504..518c84e8c38 100644 --- a/clang/lib/Lex/PPMacroExpansion.cpp +++ b/clang/lib/Lex/PPMacroExpansion.cpp @@ -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); } -- cgit v1.2.3