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.129.124]) by sourceware.org (Postfix) with ESMTPS id EDEF53858D38 for ; Tue, 20 Sep 2022 14:09:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EDEF53858D38 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=1663682942; 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=yEKslCGng0bzq01KIuta/o4J4LcOkZ6K0F/P9zHm9uU=; b=Y5c1xZfzD0WOPRIKn7L6cOzs7yKyZ5fKcWyB8ePMuvlFRAGfHbqALYXF5FISaCr4Fqf8EW PgOgWARRTSVhY/9BN5LQhfuJnAzgQrjdlKaL7SeAv3TOe7t12G4agQctrl4RtS+xGJA/95 vnLt+8GW47WMT6XbeS4DpMo48PYfoDU= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-427-5LwUpR5vPGKnnhc1AXbb1w-1; Tue, 20 Sep 2022 10:09:00 -0400 X-MC-Unique: 5LwUpR5vPGKnnhc1AXbb1w-1 Received: by mail-qv1-f69.google.com with SMTP id dw19-20020a0562140a1300b004a8eee124b4so2065507qvb.21 for ; Tue, 20 Sep 2022 07:09:00 -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; bh=yEKslCGng0bzq01KIuta/o4J4LcOkZ6K0F/P9zHm9uU=; b=zQmyX8Jf2zkxyWB7IWoPuep66MveeOnq6b6Xw6dijVpiD8g8L9+Ehva74osdNdZV4C aVvgeeNHlFIIZLp7hItaEZ4Nqp4aTcJWh+AjugkbxZOdzmwDtEGB8ZkSxX8MLNVCUBFA ZBlQrxWfHfEtc4YT2zHeuxIP/sUXcEMtU3h3XJ2hoKmxlnuuNfRRSvjYK9JdneOVsabf j1ABHJeFwzRpdgoZdFg8+XU9z105iapKLapV4IcjBezS+RLHa1lQ4Ddyzf6HUlcyq8lT PFiKzb/st7CeSR+ELHd8S6Gl4/jbpzVQsyEsWMr8THJ6OdyiaI22Vq9+u7us0nybx0MC 5kuA== X-Gm-Message-State: ACrzQf0LizATz1TVFHjxche07b2KpjW9EtH72Qg9s55N7+AsRfHjjdns GHMwbidJO2RNvlWB0HCZ9vrCDU9Yd7U1OxSrEVZ02L7HVwofcq1N8Jgpc/lVlj9yaYuEbJ8ZV7g CUVUT5gsYi/qaoSkT6w== X-Received: by 2002:a05:6214:2029:b0:4ac:b9f0:4d04 with SMTP id 9-20020a056214202900b004acb9f04d04mr18885672qvf.93.1663682940189; Tue, 20 Sep 2022 07:09:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5c0eDWK7bIB0HDlgQhSci7lT7oMl40DKFbIAeYcQYUAbRHvtIKj+rxRbzxnYt0lBejFVmYaA== X-Received: by 2002:a05:6214:2029:b0:4ac:b9f0:4d04 with SMTP id 9-20020a056214202900b004acb9f04d04mr18885650qvf.93.1663682939974; Tue, 20 Sep 2022 07:08:59 -0700 (PDT) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id p13-20020a05622a048d00b0034305a91aaesm986034qtx.83.2022.09.20.07.08.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 07:08:59 -0700 (PDT) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Tue, 20 Sep 2022 10:08:58 -0400 (EDT) To: Nathan Sidwell cc: Patrick Palka , gcc-patches@gcc.gnu.org, jason@redhat.com Subject: Re: [PATCH] c++: stream PACK_EXPANSION_EXTRA_ARGS [PR106761] In-Reply-To: Message-ID: <5e4ec1f5-a546-6830-ea97-4b3d876c002e@idea> References: <20220919135229.86545-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.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,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 Tue, 20 Sep 2022, Nathan Sidwell wrote: > On 9/19/22 09:52, Patrick Palka wrote: > > It looks like some xtreme-header-* tests are failing after the libstdc++ > > change r13-2158-g02f6b405f0e9dc ultimately because we're neglecting > > to stream PACK_EXPANSION_EXTRA_ARGS, which leads to false equivalences > > of different partial instantiations of _TupleConstraints::__constructible. > > > > Tested on x86_64-pc-linux-gnu, does this look OK for trunk? > > > > PR c++/106761 > > > > gcc/cp/ChangeLog: > > > > * module.cc (trees_out::type_node) : > > Stream PACK_EXPANSION_EXTRA_ARGS. > > (trees_in::tree_node) : Likewise. > > > Looks good, I wonder why I missed that. (I guess extracting a testcase out of > the headers was too tricky?) Many thanks. I managed to produce a small testcase which mirrors the format of the xtreme-header-2* testcase. Does the following look OK? -- >8 -- PR c++/106761 gcc/cp/ChangeLog: * module.cc (trees_out::type_node) : Stream PACK_EXPANSION_EXTRA_ARGS. (trees_in::tree_node) : Likewise. gcc/testsuite/ChangeLog: * g++.dg/modules/pr106761.h: New test. * g++.dg/modules/pr106761_a.H: New test. * g++.dg/modules/pr106761_b.C: New test. --- gcc/cp/module.cc | 3 +++ gcc/testsuite/g++.dg/modules/pr106761.h | 22 ++++++++++++++++++++++ gcc/testsuite/g++.dg/modules/pr106761_a.H | 5 +++++ gcc/testsuite/g++.dg/modules/pr106761_b.C | 7 +++++++ 4 files changed, 37 insertions(+) create mode 100644 gcc/testsuite/g++.dg/modules/pr106761.h create mode 100644 gcc/testsuite/g++.dg/modules/pr106761_a.H create mode 100644 gcc/testsuite/g++.dg/modules/pr106761_b.C diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 1a1ff5be574..9a9ef4e3332 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -8922,6 +8922,7 @@ trees_out::type_node (tree type) if (streaming_p ()) u (PACK_EXPANSION_LOCAL_P (type)); tree_node (PACK_EXPANSION_PARAMETER_PACKS (type)); + tree_node (PACK_EXPANSION_EXTRA_ARGS (type)); break; case TYPENAME_TYPE: @@ -9455,12 +9456,14 @@ trees_in::tree_node (bool is_use) { bool local = u (); tree param_packs = tree_node (); + tree extra_args = tree_node (); if (!get_overrun ()) { tree expn = cxx_make_type (TYPE_PACK_EXPANSION); SET_TYPE_STRUCTURAL_EQUALITY (expn); PACK_EXPANSION_PATTERN (expn) = res; PACK_EXPANSION_PARAMETER_PACKS (expn) = param_packs; + PACK_EXPANSION_EXTRA_ARGS (expn) = extra_args; PACK_EXPANSION_LOCAL_P (expn) = local; res = expn; } diff --git a/gcc/testsuite/g++.dg/modules/pr106761.h b/gcc/testsuite/g++.dg/modules/pr106761.h new file mode 100644 index 00000000000..9f22a22a45d --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr106761.h @@ -0,0 +1,22 @@ +// PR c++/106761 + +template +struct __and_; + +template +struct is_convertible; + +template +struct _TupleConstraints { + template + using __constructible = __and_...>; +}; + +template +struct tuple { + template + using __constructible + = typename _TupleConstraints::template __constructible; +}; + +tuple t; diff --git a/gcc/testsuite/g++.dg/modules/pr106761_a.H b/gcc/testsuite/g++.dg/modules/pr106761_a.H new file mode 100644 index 00000000000..8ad116412af --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr106761_a.H @@ -0,0 +1,5 @@ +// PR c++/106761 +// { dg-additional-options -fmodule-header } + +// { dg-module-cmi {} } +#include "pr106761.h" diff --git a/gcc/testsuite/g++.dg/modules/pr106761_b.C b/gcc/testsuite/g++.dg/modules/pr106761_b.C new file mode 100644 index 00000000000..336cb12757e --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/pr106761_b.C @@ -0,0 +1,7 @@ +// PR c++/106761 +// { dg-additional-options -fmodules-ts } + +#include "pr106761.h" +import "pr106761_a.H"; + +tuple u = t; -- 2.38.0.rc0.52.gdda7228a83