diff options
| -rw-r--r-- | lib/Rewrite/HTMLRewrite.cpp | 5 | ||||
| -rw-r--r-- | test/Misc/emit-html.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/Rewrite/HTMLRewrite.cpp b/lib/Rewrite/HTMLRewrite.cpp index cf49701a1d..0ef998deb1 100644 --- a/lib/Rewrite/HTMLRewrite.cpp +++ b/lib/Rewrite/HTMLRewrite.cpp @@ -437,6 +437,11 @@ void html::HighlightMacros(Rewriter &R, FileID FID, Preprocessor& PP) { // preprocessor directives. if (Tok.is(tok::hash) && Tok.isAtStartOfLine()) continue; + + // If this is a ## token, change its kind to unknown so that repreprocessing + // it will not produce an error. + if (Tok.is(tok::hashhash)) + Tok.setKind(tok::unknown); // If this raw token is an identifier, the raw lexer won't have looked up // the corresponding identifier info for it. Do this now so that it will be diff --git a/test/Misc/emit-html.c b/test/Misc/emit-html.c index 1bcab12dbc..c4a184584b 100644 --- a/test/Misc/emit-html.c +++ b/test/Misc/emit-html.c @@ -3,3 +3,9 @@ // rdar://6562329 #line 42 "foo.c" +// PR3635 +#define F(fmt, ...) fmt, ## __VA_ARGS__ +int main(int argc, char **argv) { + return F(argc, 1); +} + |