Author: faisalv Date: Sat Oct 14 19:13:17 2017 New Revision: 315842 URL: http://llvm.org/viewvc/llvm-project?rev=315842&view=rev Log: [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 Modified: cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td cfe/trunk/include/clang/Lex/TokenLexer.h Modified: cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td?rev=315842&r1=315841&r2=315842&view=diff ============================================================================== --- cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td (original) +++ cfe/trunk/include/clang/Basic/DiagnosticLexKinds.td Sat Oct 14 19:13:17 2017 @@ -347,8 +347,11 @@ def ext_pp_comma_expr : Extension<"comma 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<VariadicMacros>; + def err_pp_missing_lparen_in_vaopt_use : Error< "missing '(' following __VA_OPT__">; def err_pp_vaopt_nested_use : Error< Modified: cfe/trunk/include/clang/Lex/TokenLexer.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/TokenLexer.h?rev=315842&r1=315841&r2=315842&view=diff ============================================================================== --- cfe/trunk/include/clang/Lex/TokenLexer.h (original) +++ cfe/trunk/include/clang/Lex/TokenLexer.h Sat Oct 14 19:13:17 2017 @@ -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<Token> &ReplacementToks, const VAOptExpansionContext &VCtx, _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits