From: Faisal Vali Date: Sun, 15 Oct 2017 02:13:17 +0000 (+0000) Subject: [c++2a] Fix failing regression test related to not adding the extension warning to... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47036068ec0496da7accc52d18aee7809e911dfb;p=clang [c++2a] Fix failing regression test related to not adding the extension warning to a diagnostic group (in r315840) In passing also complete a comment that I left uncompleted. For ease of reference, here's the parent commit: https://reviews.llvm.org/rL315840 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@315842 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Basic/DiagnosticLexKinds.td b/include/clang/Basic/DiagnosticLexKinds.td index 6c35bab88a..af44771acd 100644 --- a/include/clang/Basic/DiagnosticLexKinds.td +++ b/include/clang/Basic/DiagnosticLexKinds.td @@ -347,8 +347,11 @@ def ext_pp_comma_expr : Extension<"comma operator in operand of #if">; def ext_pp_bad_vaargs_use : Extension< "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro">; -def ext_pp_bad_vaopt_use : Extension< - "__VA_OPT__ can only appear in the expansion of a variadic macro">; +def ext_pp_bad_vaopt_use + : ExtWarn< + "__VA_OPT__ can only appear in the expansion of a variadic macro">, + InGroup; + def err_pp_missing_lparen_in_vaopt_use : Error< "missing '(' following __VA_OPT__">; def err_pp_vaopt_nested_use : Error< diff --git a/include/clang/Lex/TokenLexer.h b/include/clang/Lex/TokenLexer.h index c32338b12d..17305107ca 100644 --- a/include/clang/Lex/TokenLexer.h +++ b/include/clang/Lex/TokenLexer.h @@ -201,7 +201,9 @@ private: /// the tokens just expanded through __VA_OPT__ processing. These (sub) /// sequence of tokens are folded into one stringified token. /// - /// \param[in] VCtx - contains information about the + /// \param[in] VCtx - contains relevent contextual information about the + /// state of the tokens around and including the __VA_OPT__ token, necessary + /// for stringification. void stringifyVAOPTContents(SmallVectorImpl &ReplacementToks, const VAOptExpansionContext &VCtx,