From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by sourceware.org (Postfix) with ESMTPS id 17E423858D20 for ; Thu, 6 Jul 2023 06:01:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 17E423858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2b6b98ac328so3684451fa.0 for ; Wed, 05 Jul 2023 23:01:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688623310; x=1691215310; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=kwCk30FPQwrOO5BW1BenpSkpwYKMq9chGWISz2TTTn8=; b=XM9skLQoE7yvcTmsZlNNukwwbepaZzlb32y4srRNjY6wAFuPTWmeGG4ZnHsCNrOxyt YElTvehh4Wg4u/KPsdGi8nO97zl5fxp/8HOxBBkn4zeLsGX3gH9tMjKWMr0op8+d4/zA ogH+oKEeeJZJmmehb1dnXpN5vceG9/GbsnufZT8+pceW3z3jwJ/X5V/Oha68rjS1XA9k nUb1NTMpfZ+SCv+5SvDbahfhs8B9ydlRRHH8yeohkcaIfqx5VtxXZRwgt+cX4rVhJQjZ LjFWUSauBGR+9PG3T86FszxnLRGNo2SxTtHpeq/VeLU3ij6bPCgC/2QAts6xqxLyjK14 cdxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688623310; x=1691215310; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kwCk30FPQwrOO5BW1BenpSkpwYKMq9chGWISz2TTTn8=; b=hElIts6UmI/p83KLoFkF1P0Xaz4QEC0Nij6ONJidR0mEZKH1iLAApVh07kMkqqisGw +USTN5d2c7PQd5Te6PZP1My9nf478chjVytsfAd6ZcXrq2y2fOV2dxwhKWXSxPWz1WJF LGkk5xkqEvN0FuY6vgQVczZlncMZ2iMdrH3gY3bDeGsfIhH6t+bEdTDcIadwpqA3gL2o J7ACUBxwYhg/ftpXWSRkSlD0FhZHGTx71oBnCH8rwp4WqvlFwd+lipmvJW3B0b2ij18I aZJNcIDe43BX/y8y099NFzRi7+ElNTPJfqPajsQdwyGLGeSZZXeJ9nLhjA3n55afEOm0 Dpsg== X-Gm-Message-State: ABy/qLaPayU4Z3X64AC/gJ2bCUUiAXbwyRGimmgZix1f8iXHYePxygOY Aary/Cr4V1a+2OnD0s6jHbmltkN+UjZLH2q5Gh21lcnc X-Google-Smtp-Source: APBJJlE8jW6ZsKkPVDrPegT1uXSgsdMHwlmRrPNHRHku3+txx88EH+tYrQ6grQYOHdnBYixuEJ/FbOpC+3b18ris2ok= X-Received: by 2002:a2e:7d14:0:b0:2b6:f21a:3dae with SMTP id y20-20020a2e7d14000000b002b6f21a3daemr521196ljc.44.1688623310025; Wed, 05 Jul 2023 23:01:50 -0700 (PDT) MIME-Version: 1.0 References: <20120808195258.GA30576@google.com> <5022CDF8.9000300@google.com> <5022D9BD.4060708@google.com> <50252386.8000505@google.com> <87jzveu08y.fsf@euler.schwinge.homeip.net> In-Reply-To: <87jzveu08y.fsf@euler.schwinge.homeip.net> From: Richard Biener Date: Thu, 6 Jul 2023 08:01:37 +0200 Message-ID: Subject: Re: GTY: Repair 'enum gty_token', 'token_names' desynchronization (was: [cxx-conversion] Support garbage-collected C++ templates) To: Thomas Schwinge Cc: gcc-patches@gcc.gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Wed, Jul 5, 2023 at 12:21=E2=80=AFPM Thomas Schwinge wrote: > > Hi! > > On 2012-08-10T11:06:46-0400, Diego Novillo wrote: > > * gengtype-lex.l (USER_GTY): Add pattern for "user". > > * gengtype-parse.c (option): Handle USER_GTY. > > (opts_have): New. > > (type): Call it. > > If the keyword 'user' is used, do not walk the fields > > of the structure. > > * gengtype.h (USER_GTY): Add. > > These changes got incorporated in > commit 0823efedd0fb8669b7e840954bc54c3b2cf08d67 (Subversion r190402). > > > --- a/gcc/gengtype-lex.l > > +++ b/gcc/gengtype-lex.l > > @@ -108,6 +108,7 @@ EOID [^[:alnum:]_] > > "enum"/{EOID} { return ENUM; } > > "ptr_alias"/{EOID} { return PTR_ALIAS; } > > "nested_ptr"/{EOID} { return NESTED_PTR; } > > +"user"/{EOID} { return USER_GTY; } > > [0-9]+ { return NUM; } > > "param"[0-9]*"_is"/{EOID} { > > *yylval =3D XDUPVAR (const char, yytext, yyleng, yyleng+1); > > > --- a/gcc/gengtype-parse.c > > +++ b/gcc/gengtype-parse.c > > @@ -499,6 +499,10 @@ option (options_p prev) > > [...] > > > --- a/gcc/gengtype.h > > +++ b/gcc/gengtype.h > > @@ -463,6 +463,7 @@ enum > > ELLIPSIS, > > PTR_ALIAS, > > NESTED_PTR, > > + USER_GTY, > > PARAM_IS, > > NUM, > > SCALAR, > > This did add 'USER_GTY' to what nowadays is known as 'enum gty_token', > but didn't accordingly update 'gcc/gengtype-parse.c:token_names', leaving > those out of sync. Updating 'gcc/gengtype-parse.c:token_value_format' > wasn't necessary, as: > > /* print_token assumes that any token >=3D FIRST_TOKEN_WITH_VALUE may= have > a meaningful value to be printed. */ > FIRST_TOKEN_WITH_VALUE =3D PARAM_IS > > This, in turn, got further confused -- or "fixed" -- by later changes: > 2014 commit 63f5d5b818319129217e41bcb23db53f99ff11b0 (Subversion r218558) > "remove gengtype support for param_is use_param, if_marked and splay tree= allocators", > which reciprocally missed corresponding clean-up. > > OK to push the attached > "GTY: Repair 'enum gty_token', 'token_names' desynchronization"? OK. > > On top of that, I'll then re-submit an adjusted > > "GTY: Clean up obsolete parametrized structs remnants". > > > Gr=C3=BC=C3=9Fe > Thomas > > > ----------------- > Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 2= 01, 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch= =C3=A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellsc= haft: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955