From 07efdfdafa58ca3f2c9c7f628bb1d43ee3d9b176 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 14 Jun 2011 18:12:03 +0000 Subject: [PATCH] Fix a crash on the testcase in PR9981 / rdar://9486765. llvm-svn: 133003 --- clang/lib/Lex/TokenLexer.cpp | 7 ++++--- clang/test/Preprocessor/macro_paste_bad.c | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/clang/lib/Lex/TokenLexer.cpp b/clang/lib/Lex/TokenLexer.cpp index 65aff0d1d037..751fd0133ea9 100644 --- a/clang/lib/Lex/TokenLexer.cpp +++ b/clang/lib/Lex/TokenLexer.cpp @@ -487,9 +487,10 @@ bool TokenLexer::PasteTokens(Token &Tok) { // Explicitly convert the token location to have proper instantiation // information so that the user knows where it came from. SourceManager &SM = PP.getSourceManager(); - SourceLocation Loc = - SM.createInstantiationLoc(PasteOpLoc, InstantiateLocStart, - InstantiateLocEnd, 2); + SourceLocation Loc = PasteOpLoc; + if (InstantiateLocStart.isValid()) + Loc = SM.createInstantiationLoc(Loc, InstantiateLocStart, + InstantiateLocEnd, 2); // If we're in microsoft extensions mode, downgrade this from a hard // error to a warning that defaults to an error. This allows // disabling it. diff --git a/clang/test/Preprocessor/macro_paste_bad.c b/clang/test/Preprocessor/macro_paste_bad.c index 2af0173040dc..1c0b74ba2982 100644 --- a/clang/test/Preprocessor/macro_paste_bad.c +++ b/clang/test/Preprocessor/macro_paste_bad.c @@ -33,3 +33,9 @@ XX // expected-error {{attempt to use a poisoned identifier}} int VA; // expected-warning {{__VA_ARGS__ can only appear in the expansion of a C99 variadic macro}} +// PR9981 +#define M1(A) A +#define M2(X) +M1(M2(##)) // expected-error {{pasting formed '()', an invalid preprocessing token}} + + -- GitLab