diff options
| -rw-r--r-- | lib/Lex/TokenConcatenation.cpp | 7 | ||||
| -rw-r--r-- | test/Preprocessor/output_paste_avoid.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/Lex/TokenConcatenation.cpp b/lib/Lex/TokenConcatenation.cpp index f7b594594f..30dc8f19d9 100644 --- a/lib/Lex/TokenConcatenation.cpp +++ b/lib/Lex/TokenConcatenation.cpp @@ -156,9 +156,10 @@ bool TokenConcatenation::AvoidConcat(const Token &PrevPrevTok, // First, check to see if the tokens were directly adjacent in the original // source. If they were, it must be okay to stick them together: if there // were an issue, the tokens would have been lexed differently. - if (PrevTok.getLocation().isFileID() && Tok.getLocation().isFileID() && - PrevTok.getLocation().getLocWithOffset(PrevTok.getLength()) == - Tok.getLocation()) + SourceManager &SM = PP.getSourceManager(); + SourceLocation PrevSpellLoc = SM.getSpellingLoc(PrevTok.getLocation()); + SourceLocation SpellLoc = SM.getSpellingLoc(Tok.getLocation()); + if (PrevSpellLoc.getLocWithOffset(PrevTok.getLength()) == SpellLoc) return false; tok::TokenKind PrevKind = PrevTok.getKind(); diff --git a/test/Preprocessor/output_paste_avoid.c b/test/Preprocessor/output_paste_avoid.c index 8e4f3a4bf4..6defd1272b 100644 --- a/test/Preprocessor/output_paste_avoid.c +++ b/test/Preprocessor/output_paste_avoid.c @@ -31,3 +31,9 @@ E: test(str) #define equal = F: >>equal // CHECK: F: >> = + +// Make sure we don't introduce spaces in the guid because we try to avoid +// pasting '-' to a numeric constant. +#define TYPEDEF(guid) typedef [uuid(guid)] +TYPEDEF(66504301-BE0F-101A-8BBB-00AA00300CAB) long OLE_COLOR; +// CHECK: typedef [uuid(66504301-BE0F-101A-8BBB-00AA00300CAB)] long OLE_COLOR; |