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 16993388F317 for ; Thu, 15 Dec 2022 14:31:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 16993388F317 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=1671114716; 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=L1AJ6eENe97dqTsrtendlkxlUVp82C8xKibjkyXCj/w=; b=S6b1ZpjMARcYh6GHZXueVr3EHRoT92qDCHvdmNrCMmQC3YBnioXz8VKHirwqme6qGgPW+/ 02FD1/uSEPmuozEhQVSJhLbngA4KdPj2wkze80zezQsYw8Q3z0/GUSNNOpuLOUMp0zlrvf xE/Y0dLdHSH1/OW5bWcpT+Ry/RWwiPs= Received: from mail-yw1-f200.google.com (mail-yw1-f200.google.com [209.85.128.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-314-nhuptfN3ODCw9ZpOP5A2IA-1; Thu, 15 Dec 2022 09:31:24 -0500 X-MC-Unique: nhuptfN3ODCw9ZpOP5A2IA-1 Received: by mail-yw1-f200.google.com with SMTP id 00721157ae682-3cf0762f741so36692587b3.16 for ; Thu, 15 Dec 2022 06:31:23 -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=L1AJ6eENe97dqTsrtendlkxlUVp82C8xKibjkyXCj/w=; b=CH1C6Dd0stw9qi/KOvK6Fo8xGsHcMr7sLw8K10ChSn7F3yb3ru2U+ocw6B2+tMVVXv ysz8gEu4p9VhKPRg7e1bCWChaJCabaqkqBRfwOPmOmtLElkh6OXcVjTVun8a8vvP/Lk8 0JN0o31Mt2dMOM9QXKLfxFgofsPyz1Vue/NQyWMMgkjLSbp42Q9wGyVqG3dyAuGS2L6c U7Lxek5LlkrNiPCRQ3o0cHNcY9O7TWIPNddbooU8KgSFWVFXgSwdJXr/tJm6iG/TuL0m 3uRORVgU+adZfN7HUOtWgbflMGKIrD/NeXuD91anxgnOl1Z+imAnEQNTsMUSAORVWrBV 5t4A== X-Gm-Message-State: ANoB5pkaalVcEs4jDSeESZe8MsYwDioKfkVGtRADiFXwcrgyCiElF5o2 m6UexLP1Kh8bC9uNPopu/iQOAA8fJlU4/7E5ZkwMWb58PYVA4W5jReOz8XjKlBN+oxk6YuJ0wPJ laBvHVH3ZemB5ypebug== X-Received: by 2002:a05:7508:3a99:b0:47:1b88:701e with SMTP id de25-20020a0575083a9900b000471b88701emr2795866gbb.0.1671114683339; Thu, 15 Dec 2022 06:31:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf6cnFeNIVc+TNBDJn+kyV9bYkSiMBmP7N8E2atzlvjTWshj3fGyzfW3eYIWV2lj/xqxk8UkSw== X-Received: by 2002:a05:7508:3a99:b0:47:1b88:701e with SMTP id de25-20020a0575083a9900b000471b88701emr2795778gbb.0.1671114682504; Thu, 15 Dec 2022 06:31:22 -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 u7-20020a37ab07000000b006bb29d932e1sm11767185qke.105.2022.12.15.06.31.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Dec 2022 06:31:21 -0800 (PST) Message-ID: Date: Thu, 15 Dec 2022 09:31:20 -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++: partial ordering with memfn pointer cst [PR108104] To: Patrick Palka , gcc-patches@gcc.gnu.org References: <20221215000145.2381507-1-ppalka@redhat.com> From: Jason Merrill In-Reply-To: <20221215000145.2381507-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=-12.4 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/14/22 19:01, Patrick Palka wrote: > Here we're triggering an overzealous assert in unify during partial > ordering since the member function pointer constants are represented as > ordinary CONSTRUCTORs (with TYPE_PTRMEMFUNC_P TREE_TYPE) but the assert > expects only COMPOUND_LITERAL_P constructors. > > Bootstrapped and regtested on x86_64-pc-linux, does this look OK for > trunk and perhaps 12? OK for both. > PR c++/108104 > > gcc/cp/ChangeLog: > > * pt.cc (unify) : Relax assert to accept any > CONSTRUCTOR not just COMPOUND_LITERAL_P ones. > > gcc/testsuite/ChangeLog: > > * g++.dg/template/ptrmem33.C: New test. > --- > gcc/cp/pt.cc | 2 +- > gcc/testsuite/g++.dg/template/ptrmem33.C | 30 ++++++++++++++++++++++++ > 2 files changed, 31 insertions(+), 1 deletion(-) > create mode 100644 gcc/testsuite/g++.dg/template/ptrmem33.C > > diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc > index 2f0f7a39698..44058d30799 100644 > --- a/gcc/cp/pt.cc > +++ b/gcc/cp/pt.cc > @@ -24921,7 +24921,7 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict, > if (is_overloaded_fn (parm) || type_unknown_p (parm)) > return unify_success (explain_p); > gcc_assert (EXPR_P (parm) > - || COMPOUND_LITERAL_P (parm) > + || TREE_CODE (parm) == CONSTRUCTOR > || TREE_CODE (parm) == TRAIT_EXPR); > expr: > /* We must be looking at an expression. This can happen with > diff --git a/gcc/testsuite/g++.dg/template/ptrmem33.C b/gcc/testsuite/g++.dg/template/ptrmem33.C > new file mode 100644 > index 00000000000..dca741ae5e2 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/template/ptrmem33.C > @@ -0,0 +1,30 @@ > +// PR c++/108104 > +// { dg-do compile { target c++11 } } > + > +struct A { > + void x(); > + void y(); > +}; > + > +enum State { On }; > + > +template > +struct B { > + static void f(); > +}; > + > +template > +struct B { > + static void g(); > +}; > + > +template > +struct B { > + static void h(); > +}; > + > +int main() { > + B::f(); > + B::g(); > + B::h(); > +}