From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 0D0DF3858D39 for ; Tue, 18 Oct 2022 18:26:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0D0DF3858D39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666117573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=qvik4hVLbu4lWY264ruKJsBzYGk8ye1hsheG0zhxmCM=; b=KYm2PZcPtw+yfrKSdtLEKv4ZQE5/5sJD/3q/BTKwEHm+EoL/ss137KJHfTRK4dNMvHxWyQ 3Pj01dC/1awxgjbYTT54h4HXxOQ4SlIsWGnhot3p4G0JGP5VJvboXkebbL1wx6uTxYy1Ep vG/cLc7TD/CcU7sIpGqIta3I7jmMRGE= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-660-iYuFW-NOPMK8N8xW-b6MHg-1; Tue, 18 Oct 2022 14:26:11 -0400 X-MC-Unique: iYuFW-NOPMK8N8xW-b6MHg-1 Received: by mail-qt1-f199.google.com with SMTP id s14-20020a05622a1a8e00b00397eacd9c1aso11339473qtc.21 for ; Tue, 18 Oct 2022 11:26:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:references:message-id:in-reply-to:subject:cc:to:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qvik4hVLbu4lWY264ruKJsBzYGk8ye1hsheG0zhxmCM=; b=r1GnQhVsYYzYf52Z1vQ0XPtotPPkU2rVle31hQB8zITa+jICsT9lO24FW/DqRkdDG3 WrqATViRUMtA3uKtuTo31sImHtKoPNMiZGV9v3bc3vwiqAP/IIlHS1mtFi1K2OSUbf2U y6V99BwYK+prOK/8x4upuHBqta+c58kjHzxFsD4lG6dycrx3dbiExxmG205AB5b/jBIU PGw50ryuRnwRAOYYKNaaCLAk3sgp3GOp/ocz9Wv5i3z6MIUIYSdjrULYhPUC9Iu804i0 uWxn2GAyPNjqzW40idfoGjzuqA9vwgXEsVQpwEhwl0nI2qrK6E/eh8l2AHAA63HgBc0B 4EIQ== X-Gm-Message-State: ACrzQf3Jaqv185haEqEUzhlY+gltOsZyfWd/OcfaolOLC/FprTUiyLKb BWpwBuXovF1cvtI+MmWgUwjqrGjrJPlmD6NzTdqL3QHtwYdiudooVtH9O9O9Y8Mr9uwaiFg9ljX e7MvU+yj5hbvmB3s6Og== X-Received: by 2002:a05:622a:40f:b0:394:57eb:ced0 with SMTP id n15-20020a05622a040f00b0039457ebced0mr3179924qtx.225.1666117571183; Tue, 18 Oct 2022 11:26:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5dKpsJbapTTyLkXLXLB9kc2UiX8DoBWlDezYF5sbOhM2Rt28//Ou3TOv9jR4HJH8NU1cD40A== X-Received: by 2002:a05:622a:40f:b0:394:57eb:ced0 with SMTP id n15-20020a05622a040f00b0039457ebced0mr3179903qtx.225.1666117570880; Tue, 18 Oct 2022 11:26:10 -0700 (PDT) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id q21-20020a37f715000000b006cebda00630sm2847212qkj.60.2022.10.18.11.26.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 11:26:10 -0700 (PDT) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Tue, 18 Oct 2022 14:26:09 -0400 (EDT) To: Richard Biener cc: Patrick Palka , gcc-patches@gcc.gnu.org, nathan@acm.org Subject: Re: [PATCH] c++ modules: verify_type failure with typedef enum [PR106848] In-Reply-To: Message-ID: <5cf07598-68ce-efda-05c3-625a1466195f@idea> References: <20221013153921.3795800-1-ppalka@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-14.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP 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 Fri, 14 Oct 2022, Richard Biener wrote: > On Thu, Oct 13, 2022 at 5:40 PM Patrick Palka via Gcc-patches > wrote: > > > > Here during stream in we end up having created a type variant for the enum > > before we read the enum's definition, and thus the variant inherited stale > > TYPE_VALUES and TYPE_MIN/MAX_VALUES, which leads to an ICE (with -g). The > > stale variant got created from set_underlying_type during earlier stream in > > of the (redundant) typedef for the enum. > > > > This patch works around this by setting TYPE_VALUES and TYPE_MIN/MAX_VALUES > > for all variants when reading in an enum definition. Does this look like > > the right approach? Or perhaps we need to arrange that we read the enum > > definition before reading in the typedef decl? Note that seems to be an > > issue only when the typedef name and enum names are the same (thus the > > typedef is redundant), otherwise we seem to read the enum definition first > > as desired. > > > > PR c++/106848 > > > > gcc/cp/ChangeLog: > > > > * module.cc (trees_in::read_enum_def): Set the TYPE_VALUES, > > TYPE_MIN_VALUE and TYPE_MAX_VALUE of all type variants. > > > > gcc/testsuite/ChangeLog: > > > > * g++.dg/modules/enum-9_a.H: New test. > > * g++.dg/modules/enum-9_b.C: New test. > > --- > > gcc/cp/module.cc | 9 ++++++--- > > gcc/testsuite/g++.dg/modules/enum-9_a.H | 5 +++++ > > gcc/testsuite/g++.dg/modules/enum-9_b.C | 6 ++++++ > > 3 files changed, 17 insertions(+), 3 deletions(-) > > create mode 100644 gcc/testsuite/g++.dg/modules/enum-9_a.H > > create mode 100644 gcc/testsuite/g++.dg/modules/enum-9_b.C > > > > diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc > > index 7ffeefa7c1f..97fb80bcd44 100644 > > --- a/gcc/cp/module.cc > > +++ b/gcc/cp/module.cc > > @@ -12303,9 +12303,12 @@ trees_in::read_enum_def (tree defn, tree maybe_template) > > > > if (installing) > > { > > - TYPE_VALUES (type) = values; > > - TYPE_MIN_VALUE (type) = min; > > - TYPE_MAX_VALUE (type) = max; > > + for (tree t = type; t; t = TYPE_NEXT_VARIANT (t)) > > + { > > + TYPE_VALUES (t) = values; > > + TYPE_MIN_VALUE (t) = min; > > + TYPE_MAX_VALUE (t) = max; > > + } > > it's definitely somewhat ugly but at least type_hash_canon doesn't hash > these for ENUMERAL_TYPE (but it does compare them! which in principle > means it could as well hash them ...) > > I think that if you read both from the same module that you should arrange > to read what you refer to first? But maybe that's not the actual issue here. *nod* reading in the enum before reading in the typedef seems like the most direct solution, though not sure how to accomplish that :/ A somewhat orthogonal issue (that incidentally fixes this testcase) is that we stream TYPE_MIN/MAX_VALUE only for enums with a definition, but the frontend sets these fields even for opaque enums. If we make sure to stream these fields for all ENUMERAL_TYPEs, then we won't have to worry about these fields being stale for variants that may have been created before reading in the enum definition (their TYPE_VALUES field will still be stale I guess, but verify_type doesn't worry about that it seems, so we avoid the ICE). patch to that effect is at https://gcc.gnu.org/pipermail/gcc-patches/2022-October/603831.html > > Richard. > > > > > rest_of_type_compilation (type, DECL_NAMESPACE_SCOPE_P (defn)); > > } > > diff --git a/gcc/testsuite/g++.dg/modules/enum-9_a.H b/gcc/testsuite/g++.dg/modules/enum-9_a.H > > new file mode 100644 > > index 00000000000..fb7d10ad3b6 > > --- /dev/null > > +++ b/gcc/testsuite/g++.dg/modules/enum-9_a.H > > @@ -0,0 +1,5 @@ > > +// PR c++/106848 > > +// { dg-additional-options -fmodule-header } > > +// { dg-module-cmi {} } > > + > > +typedef enum memory_order { memory_order_seq_cst } memory_order; > > diff --git a/gcc/testsuite/g++.dg/modules/enum-9_b.C b/gcc/testsuite/g++.dg/modules/enum-9_b.C > > new file mode 100644 > > index 00000000000..63e81675d0a > > --- /dev/null > > +++ b/gcc/testsuite/g++.dg/modules/enum-9_b.C > > @@ -0,0 +1,6 @@ > > +// PR c++/106848 > > +// { dg-additional-options "-fmodules-ts -g" } > > + > > +import "enum-9_a.H"; > > + > > +memory_order x = memory_order_seq_cst; > > -- > > 2.38.0.68.ge85701b4af > > > >