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 ED4E83858D1E for ; Mon, 19 Dec 2022 17:19:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ED4E83858D1E 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=1671470360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2hVv9e4VHxMvnhDgXSCFrKgQgYv41YHx58M4V7yLtio=; b=gs764wK+go5RBY3ePTYrr74ixdK49ZBgAzlCEtPQLh7B5eKhA2VZq89eQdUb4W5HdWZ1Qo 25iZ4pdqDjlehPXjYz3VRUwceOKXo/Q1a2QLgaCwadWcnDMwYckli8qWdCs6h0AN+rjl6Y kikOQNLwTn6tPIixZl34wQmVzyhOGkU= Received: from mail-yw1-f197.google.com (mail-yw1-f197.google.com [209.85.128.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-475-NP1OIlBIP3aWPGBUfMXFhQ-1; Mon, 19 Dec 2022 12:19:18 -0500 X-MC-Unique: NP1OIlBIP3aWPGBUfMXFhQ-1 Received: by mail-yw1-f197.google.com with SMTP id 00721157ae682-3b0af5bcbd3so115270407b3.0 for ; Mon, 19 Dec 2022 09:19:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2hVv9e4VHxMvnhDgXSCFrKgQgYv41YHx58M4V7yLtio=; b=enVpi7IWvCq9AGe4qc3ap5TZgqNtWUmBFWfzJK3kKeTjefkMHj6D7Fbn/V43Mngh53 FfxZ7k+Oqb+grqr+OVbnQZGydUlWWyxxOUBl21ldR226vw7DLIKhcHwbhGjiqfKjlJ0Z oJE7/4q9dA9bEBxajL4j3T0aIbttJFO6rLFeKyjYAAZClNsrVB9gC49aTqcm0WHAR4KE nqtX5XROgdKjFzt/Mwmnhuk8HmW08S/FKNHJfI8zi/9AYbkx5bHkD/h0B9deUEy63+Gh N8MocM+HR4e43GowMl28fSJEdS1P5++XU2dmWGMmLiHMjk+Avfk2zXY+rrN/7/tjVJnB RJow== X-Gm-Message-State: AFqh2kr12MPJikB8vq/90gboNAe0tZ3VKldcOSFc+Q1o9ysoDRCCwHFP MTJtedP+pRWb5jlpTquyJcqaetdNb5m2c4YjsE7o0cxUPyqMua6WDaVZ016mxVKPcGX6F2DB8y5 jYc0A9h5xJEnnnB5BOA== X-Received: by 2002:a0d:d084:0:b0:396:b03b:9d4a with SMTP id s126-20020a0dd084000000b00396b03b9d4amr4424454ywd.20.1671470358230; Mon, 19 Dec 2022 09:19:18 -0800 (PST) X-Google-Smtp-Source: AMrXdXsPyCxs3Je+JzoIQ5vNxJYOz0kIQcIpay6YOpmeD3nwpeyrf7QPgkIp2Oz0YAN1jLzqq73SPQ== X-Received: by 2002:a0d:d084:0:b0:396:b03b:9d4a with SMTP id s126-20020a0dd084000000b00396b03b9d4amr4424432ywd.20.1671470357840; Mon, 19 Dec 2022 09:19:17 -0800 (PST) Received: from [192.168.1.108] (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id dt17-20020a05620a479100b007023fc46b64sm3997596qkb.113.2022.12.19.09.19.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 Dec 2022 09:19:17 -0800 (PST) Message-ID: <8f838b4f-5206-248f-c1f4-92d51f6724e4@redhat.com> Date: Mon, 19 Dec 2022 12:19:16 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: Re: [PATCH] c++: ICE with concepts TS multiple auto deduction [PR101886] To: Patrick Palka , gcc-patches@gcc.gnu.org References: <20221207201827.1720474-1-ppalka@redhat.com> From: Jason Merrill In-Reply-To: <20221207201827.1720474-1-ppalka@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,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 12/7/22 15:18, Patrick Palka wrote: > In extract_autos_r, we need to reset TYPE_CANONICAL for the template > type parameter after adjusting its index, otherwise we end up with a > comptypes ICE for the below testcase. Note that such in-place type > adjustment isn't generallly safe to do since the type could be the > TYPE_CANONICAL of another (unadjusted) type, but in this case the > canonical auto (of some level and 0 index) is the first auto (of that > level) that's created, and so any auto that we do end up adjusting can't > be the canonical one. > > Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for > trunk? OK. > PR c++/101886 > > gcc/cp/ChangeLog: > > * pt.cc (extract_autos_r): Reset TYPE_CANONICAL after > adjusting the template type parameter's index. Simplify > by using TEMPLATE_TYPE_IDX. Add some sanity checks. > > gcc/testsuite/ChangeLog: > > * g++.dg/concepts/auto5.C: New test. > --- > gcc/cp/pt.cc | 12 +++++++++--- > gcc/testsuite/g++.dg/concepts/auto5.C | 9 +++++++++ > 2 files changed, 18 insertions(+), 3 deletions(-) > create mode 100644 gcc/testsuite/g++.dg/concepts/auto5.C > > diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc > index 24ed718ffbb..d05a49b1c11 100644 > --- a/gcc/cp/pt.cc > +++ b/gcc/cp/pt.cc > @@ -29164,18 +29164,24 @@ extract_autos_r (tree t, void *data) > { > /* All the autos were built with index 0; fix that up now. */ > tree *p = hash.find_slot (t, INSERT); > - unsigned idx; > + int idx; > if (*p) > /* If this is a repeated constrained-type-specifier, use the index we > chose before. */ > - idx = TEMPLATE_PARM_IDX (TEMPLATE_TYPE_PARM_INDEX (*p)); > + idx = TEMPLATE_TYPE_IDX (*p); > else > { > /* Otherwise this is new, so use the current count. */ > *p = t; > idx = hash.elements () - 1; > } > - TEMPLATE_PARM_IDX (TEMPLATE_TYPE_PARM_INDEX (t)) = idx; > + if (idx != TEMPLATE_TYPE_IDX (t)) > + { > + gcc_checking_assert (TEMPLATE_TYPE_IDX (t) == 0); > + gcc_checking_assert (TYPE_CANONICAL (t) != t); > + TEMPLATE_TYPE_IDX (t) = idx; > + TYPE_CANONICAL (t) = canonical_type_parameter (t); > + } > } > > /* Always keep walking. */ > diff --git a/gcc/testsuite/g++.dg/concepts/auto5.C b/gcc/testsuite/g++.dg/concepts/auto5.C > new file mode 100644 > index 00000000000..f1d653efd87 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/concepts/auto5.C > @@ -0,0 +1,9 @@ > +// PR c++/101886 > +// { dg-do compile { target c++17_only } } > +// { dg-options "-fconcepts-ts" } > + > +template struct A { }; > + > +A a; > +A b1 = a; > +A b2 = a;