diff options
| -rw-r--r-- | clang/lib/Lex/PPMacroExpansion.cpp | 9 | ||||
| -rw-r--r-- | clang/test/Preprocessor/macro_fn_varargs_named.c | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp index 23dfbbca578..fb9b613f5c8 100644 --- a/clang/lib/Lex/PPMacroExpansion.cpp +++ b/clang/lib/Lex/PPMacroExpansion.cpp @@ -370,9 +370,12 @@ MacroArgs *Preprocessor::ReadFunctionLikeMacroArgs(Token &MacroName, // A("blah") Diag(Tok, diag::ext_missing_varargs_arg); - // Remember this occurred if this is a C99 macro invocation with at least - // one actual argument. - isVarargsElided = MI->isC99Varargs() && MI->getNumArgs() > 1; + // Remember this occurred if this is a macro invocation with at least + // one actual argument. This allows us to elide the comma when used for + // cases like: + // #define A(x, foo...) blah(a, ## foo) + // #define A(x, ...) blah(a, ## __VA_ARGS__) + isVarargsElided = MI->getNumArgs() > 1; } else if (MI->getNumArgs() == 1) { // #define A(x) // A() diff --git a/clang/test/Preprocessor/macro_fn_varargs_named.c b/clang/test/Preprocessor/macro_fn_varargs_named.c index 75ee96105d8..095de82bbb7 100644 --- a/clang/test/Preprocessor/macro_fn_varargs_named.c +++ b/clang/test/Preprocessor/macro_fn_varargs_named.c @@ -1,7 +1,10 @@ // RUN: clang -E %s | grep '^a: x$' && // RUN: clang -E %s | grep '^b: x y, z,h$' +// RUN: clang -E %s | grep '^c: foo(x)$' #define A(b, c...) b c a: A(x) b: A(x, y, z,h) +#define B(b, c...) foo(b, ## c) +c: B(x) |
