maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

move token paste poisoning diagnostics to after the instantiation loc 

for a token is set, this makes the diagnostic "expanded from stack" work
for this diagnostic.  Add a testcase for PR3918.

llvm-svn: 69544
This commit is contained in:
Chris Lattner 2009-04-19 20:29:42 +00:00
parent 08a375b954
commit 1c1a00cf51
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
clang/lib/Lex/TokenLexer.cpp
View File

@ -308,13 +308,18 @@ void TokenLexer::Lex(Token &Tok) {
// Get the next token to return.
Tok = Tokens[CurToken++];
bool TokenIsFromPaste = false;
// If this token is followed by a token paste (##) operator, paste the tokens!
if (!isAtEnd() && Tokens[CurToken].is(tok::hashhash))
if (PasteTokens(Tok)) {
// When handling the microsoft /##/ extension, the final token is
// returned by PasteTokens, not the pasted token.
return;
} else {
TokenIsFromPaste = true;
}
// The token's current location indicate where the token was lexed from. We
// need this information to compute the spelling of the token, but any
@ -342,6 +347,17 @@ void TokenLexer::Lex(Token &Tok) {
// turning "for" into a keyword.
Tok.setKind(II->getTokenID());
// If this identifier was poisoned and from a paste, emit an error. This
// won't be handled by Preprocessor::HandleIdentifier because this is coming
// from a macro expansion.
if (II->isPoisoned() && TokenIsFromPaste) {
// We warn about __VA_ARGS__ with poisoning.
if (II->isStr("__VA_ARGS__"))
PP.Diag(Tok, diag::ext_pp_bad_vaargs_use);
else
PP.Diag(Tok, diag::err_pp_used_poisoned_id);
}
if (!DisableMacroExpansion && II->isHandleIdentifierCase())
PP.HandleIdentifier(Tok);
}
@ -476,17 +492,6 @@ bool TokenLexer::PasteTokens(Token &Tok) {
// by saying we're skipping contents, so we need to do this manually.
IdentifierInfo *II = PP.LookUpIdentifierInfo(Tok, ResultTokStrPtr);
Tok.setIdentifierInfo(II);
// If this identifier was poisoned, emit an error. This won't be handled by
// Preprocessor::HandleIdentifier because this is coming from a macro
// expansion.
if (II->isPoisoned()) {
// We warn about __VA_ARGS__ with poisoning.
if (II->isStr("__VA_ARGS__"))
PP.Diag(Tok, diag::ext_pp_bad_vaargs_use);
else
PP.Diag(Tok, diag::err_pp_used_poisoned_id);
}
}
return false;
}

13
clang/test/Preprocessor/macro_paste_bad.c
View File

@ -18,3 +18,16 @@ XYZ
#define i ## // expected-error {{'##' cannot appear at start of macro expansion}}
#define j() ## // expected-error {{'##' cannot appear at start of macro expansion}}
// Invalid token pasting.
// PR3918
// When pasting creates poisoned identifiers, we error.
#pragma GCC poison BLARG
BLARG // expected-error {{attempt to use a poisoned identifier}}
#define XX BL ## ARG
XX // expected-error {{attempt to use a poisoned identifier}}
#define VA __VA_ ## ARGS__
int VA; // expected-warning {{__VA_ARGS__ can only appear in the expansion of a C99 variadic macro}}