From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2153) id 6BA56385734C; Wed, 15 Jun 2022 12:02:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6BA56385734C MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-10072] libcpp: Ignore CPP_PADDING tokens in _cpp_parse_expr [PR105732] X-Act-Checkin: gcc X-Git-Author: Jakub Jelinek X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 61bb64a852eae00e9919da071b6a9d4497664cf2 X-Git-Newrev: 49e320ac0792672e2137ca47215fd7f935302895 Message-Id: <20220615120233.6BA56385734C@sourceware.org> Date: Wed, 15 Jun 2022 12:02:33 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2022 12:02:33 -0000 https://gcc.gnu.org/g:49e320ac0792672e2137ca47215fd7f935302895 commit r11-10072-g49e320ac0792672e2137ca47215fd7f935302895 Author: Jakub Jelinek Date: Sun May 29 21:57:51 2022 +0200 libcpp: Ignore CPP_PADDING tokens in _cpp_parse_expr [PR105732] The first part of the following testcase (m1-m3 macros and its use) regressed with my PR89971 fix, but as the m1,m4-m5 and its use part shows, the problem isn't new, we can emit a CPP_PADDING token to avoid it from being adjacent to whatever comes after the __VA_OPT__ (in this case there is nothing afterwards, true). In most cases these CPP_PADDING tokens don't matter, all other callers of cpp_get_token_with_location either ignore CPP_PADDING tokens completely (e.g. c_lex_with_flags) or they just remember them and take them into account when printing stuff whether there should be added whitespace or not (scan_translation_unit + token_streamer::stream). So, I think we should just ignore CPP_PADDING tokens the same way in _cpp_parse_expr. 2022-05-27 Jakub Jelinek PR preprocessor/105732 * expr.c (_cpp_parse_expr): Handle CPP_PADDING by just another token. * c-c++-common/cpp/va-opt-10.c: New test. (cherry picked from commit 58a40e76ebadce78639644cd3d56e42b68336927) Diff: --- gcc/testsuite/c-c++-common/cpp/va-opt-10.c | 18 ++++++++++++++++++ libcpp/expr.c | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/gcc/testsuite/c-c++-common/cpp/va-opt-10.c b/gcc/testsuite/c-c++-common/cpp/va-opt-10.c new file mode 100644 index 00000000000..f810b429dd6 --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/va-opt-10.c @@ -0,0 +1,18 @@ +/* PR preprocessor/105732 */ +/* { dg-do compile } */ +/* { dg-options "-std=gnu99" { target c } } */ +/* { dg-options "-std=c++20" { target c++ } } */ + +#define m1(p1, p2, p3) p3 +#define m2(p1, ...) 1##__VA_OPT__(foo) +#define m3(...) m1(1, 2, m2) +#define m4(p1, ...) 1 __VA_OPT__() +#define m5(...) m1(1, 2, m4) +#if m3(,)(,) +#else +#error +#endif +#if m5(,)(,) +#else +#error +#endif diff --git a/libcpp/expr.c b/libcpp/expr.c index dd5611dce0e..57db654ed31 100644 --- a/libcpp/expr.c +++ b/libcpp/expr.c @@ -1370,6 +1370,10 @@ _cpp_parse_expr (cpp_reader *pfile, bool is_if) op.op = CPP_UMINUS; break; + case CPP_PADDING: + lex_count--; + continue; + default: if ((int) op.op <= (int) CPP_EQ || (int) op.op >= (int) CPP_PLUS_EQ) SYNTAX_ERROR2_AT (op.loc,