unsigned NumToks, bool VarargsElided) {
assert(MI->isFunctionLike() &&
"Can't have args for an object-like macro!");
-
+
// Allocate memory for the MacroArgs object with the lexer tokens at the end.
MacroArgs *Result = (MacroArgs*)malloc(sizeof(MacroArgs) +
NumToks*sizeof(Token));
// Lex all of the macro-expanded tokens into Result.
do {
Result.push_back(Token());
- PP.Lex(Result.back());
+ Token &Tok = Result.back();
+ PP.Lex(Tok);
+
+ // Eagerly resolve instantiation ID's to their spelling location. This
+ // makes it so we only have to get the spelling loc once per macro argument
+ // preexpansion instead of once per each time the token is expanded.
+ if (!Tok.getLocation().isFileID())
+ Tok.setLocation(PP.getSourceManager().getSpellingLoc(Tok.getLocation()));
} while (Result.back().isNot(tok::eof));
// Pop the token stream off the top of the stack. We know that the internal
Token EOFTok;
EOFTok.startToken();
EOFTok.setKind(tok::eof);
- EOFTok.setLocation(Tok.getLocation());
+ EOFTok.setLocation(SourceMgr.getSpellingLoc(Tok.getLocation()));
EOFTok.setLength(0);
ArgTokens.push_back(EOFTok);
++NumActuals;