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 C6EBF3858D39 for ; Tue, 13 Sep 2022 12:53:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C6EBF3858D39 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=1663073598; 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=uYLh0dHuW2MvkM6mV55VHQO0/cNgjR5yDKO+cJR1sN4=; b=MHEJR83CVjYR9F3uzfofuyB+SUKLvfI8XSZayZAKkl0+JSdeifgPeeHH/fXAbFRWgFblCl zlk4LSy3y6XDT5jwY98sYdmPR78QLE+f9PS4WP1Hitfe1dIbqZPpmlP9Y6H6KBBaKJAcGE l+ycP0N5PaVnybHaukXfQ8RgUDUFMKw= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-266-MjRqjl3TNIeuDk4Pow3bRQ-1; Tue, 13 Sep 2022 08:53:17 -0400 X-MC-Unique: MjRqjl3TNIeuDk4Pow3bRQ-1 Received: by mail-qv1-f71.google.com with SMTP id w19-20020a0562140b3300b0049cad77df78so7889905qvj.6 for ; Tue, 13 Sep 2022 05:53:17 -0700 (PDT) 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; bh=uYLh0dHuW2MvkM6mV55VHQO0/cNgjR5yDKO+cJR1sN4=; b=vj+isKTe1gw5kk9QJrZ+diZf+NzDeiYepOykLk7JeT1tqIBu6uEXrHaSDc09OS676d i+vwNR7woO4Uno9hjZNSm2fAho5/0kMPOBDnC1SlbDAJlstAw40Xg4trqKMQUKPgKJ8E DJNab3gPKf9huF9Cg9s7wpKs7Rdz0RK9/53PpM9KgEmMP23PtBiiOTJiUrdIdR2y0MR4 fUnWos5W9JXgfN2/BnZP85PEJUISaSP2rQIRjETYZee4O48Uve//NfPs4d5K8g21CI7L k3XIGXAos+Qv3FiIF7P8vV4tv535Bgyg8Jnajv2wumGpkdw3SfyvZzWehEasZ7vDwPiK iEWg== X-Gm-Message-State: ACgBeo1kQ5c4nPMwF8BF87bx/yKL1mMj2xrD7RGgs5TWK7XDsr+i6ztc ofMxUeHAQ7Sl+6+6NuCt9hm3SGieprvn1U5HuqRNXtOhEBOMVkBVEaQUGfZCK//2DtJYOdBNjX3 qKS8X5JC1IB8n8WS3eA== X-Received: by 2002:a05:620a:2703:b0:6bc:6a30:cc0f with SMTP id b3-20020a05620a270300b006bc6a30cc0fmr22456385qkp.66.1663073596729; Tue, 13 Sep 2022 05:53:16 -0700 (PDT) X-Google-Smtp-Source: AA6agR59aDWS5gk60FqDJR0O6R45y9KT75LAKKEi5+EKUXHC/OugcPvud3WrrRINU05lH4yzcYo3CQ== X-Received: by 2002:a05:620a:2703:b0:6bc:6a30:cc0f with SMTP id b3-20020a05620a270300b006bc6a30cc0fmr22456360qkp.66.1663073596329; Tue, 13 Sep 2022 05:53:16 -0700 (PDT) Received: from [192.168.1.101] (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 br22-20020a05622a1e1600b0035bb6c3811asm3613155qtb.53.2022.09.13.05.53.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 13 Sep 2022 05:53:15 -0700 (PDT) Message-ID: <30bb32f6-3f08-5a45-e39a-ae8f49bc4af0@redhat.com> Date: Tue, 13 Sep 2022 08:53:14 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.13.0 Subject: Re: [PATCH] c++: some missing-SFINAE fixes To: Patrick Palka , gcc-patches@gcc.gnu.org References: <20220913114538.2741902-1-ppalka@redhat.com> From: Jason Merrill In-Reply-To: <20220913114538.2741902-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.3 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_LOW,SPF_HELO_NONE,SPF_NONE,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 9/13/22 07:45, Patrick Palka wrote: > It looks like we aren't respecting SFINAE for: > > * an invalid/non-constant conditional explicit-specifier > * a non-constant conditional noexcept-specifier > * a non-constant argument to __integer_pack > > This patch fixes these issues in the usual way, by passing complain > and propagating error_mark_node appropriately. > > Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for > trunk? > > gcc/cp/ChangeLog: > > * decl.cc (build_explicit_specifier): Pass complain to > cxx_constant_value. > * except.cc (build_noexcept_spec): Likewise. > * pt.cc (expand_integer_pack): Likewise. > (tsubst_function_decl): Propagate error_mark_node returned > from build_explicit_specifier. > > gcc/testsuite/ChangeLog: > > * g++.dg/cpp1z/noexcept-type26.C: New test. > * g++.dg/cpp2a/explicit19.C: New test. > * g++.dg/ext/integer-pack6.C: New test. > --- > gcc/cp/decl.cc | 2 +- > gcc/cp/except.cc | 2 +- > gcc/cp/pt.cc | 6 ++++-- > gcc/testsuite/g++.dg/cpp1z/noexcept-type26.C | 12 ++++++++++++ > gcc/testsuite/g++.dg/cpp2a/explicit19.C | 12 ++++++++++++ > gcc/testsuite/g++.dg/ext/integer-pack6.C | 13 +++++++++++++ > 6 files changed, 43 insertions(+), 4 deletions(-) > create mode 100644 gcc/testsuite/g++.dg/cpp1z/noexcept-type26.C > create mode 100644 gcc/testsuite/g++.dg/cpp2a/explicit19.C > create mode 100644 gcc/testsuite/g++.dg/ext/integer-pack6.C > > diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc > index 936f1cf0197..5404d7e084c 100644 > --- a/gcc/cp/decl.cc > +++ b/gcc/cp/decl.cc > @@ -18557,7 +18557,7 @@ build_explicit_specifier (tree expr, tsubst_flags_t complain) > > expr = build_converted_constant_bool_expr (expr, complain); > expr = instantiate_non_dependent_expr (expr, complain); > - expr = cxx_constant_value (expr); > + expr = cxx_constant_value (expr, NULL_TREE, complain); The patch is OK, but perhaps we want another overload that omits the object parameter? > return expr; > } > > diff --git a/gcc/cp/except.cc b/gcc/cp/except.cc > index 7fdbc747c22..4d7f0ce102d 100644 > --- a/gcc/cp/except.cc > +++ b/gcc/cp/except.cc > @@ -1257,7 +1257,7 @@ build_noexcept_spec (tree expr, tsubst_flags_t complain) > { > expr = build_converted_constant_bool_expr (expr, complain); > expr = instantiate_non_dependent_expr (expr, complain); > - expr = cxx_constant_value (expr); > + expr = cxx_constant_value (expr, NULL_TREE, complain); > } > if (TREE_CODE (expr) == INTEGER_CST) > { > diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc > index 1c6f4b84612..f16f5ffca20 100644 > --- a/gcc/cp/pt.cc > +++ b/gcc/cp/pt.cc > @@ -3869,7 +3869,7 @@ expand_integer_pack (tree call, tree args, tsubst_flags_t complain, > else > { > hi = instantiate_non_dependent_expr (hi, complain); > - hi = cxx_constant_value (hi); > + hi = cxx_constant_value (hi, NULL_TREE, complain); > int len = valid_constant_size_p (hi) ? tree_to_shwi (hi) : -1; > > /* Calculate the largest value of len that won't make the size of the vec > @@ -14312,7 +14312,9 @@ tsubst_function_decl (tree t, tree args, tsubst_flags_t complain, > /*function_p=*/false, > /*i_c_e_p=*/true); > spec = build_explicit_specifier (spec, complain); > - if (instantiation_dependent_expression_p (spec)) > + if (spec == error_mark_node) > + return error_mark_node; > + else if (instantiation_dependent_expression_p (spec)) > store_explicit_specifier (r, spec); > else > { > diff --git a/gcc/testsuite/g++.dg/cpp1z/noexcept-type26.C b/gcc/testsuite/g++.dg/cpp1z/noexcept-type26.C > new file mode 100644 > index 00000000000..73058395f0a > --- /dev/null > +++ b/gcc/testsuite/g++.dg/cpp1z/noexcept-type26.C > @@ -0,0 +1,12 @@ > +// Verify a non-constant conditional noexcept-specifier of a function type > +// is a SFINAE error. > +// { dg-do compile { target c++17 } } > + > +template void f(void() noexcept(T::value)) = delete; > +template void f(...); > + > +struct B { static bool value; }; > + > +int main() { > + f(nullptr); > +} > diff --git a/gcc/testsuite/g++.dg/cpp2a/explicit19.C b/gcc/testsuite/g++.dg/cpp2a/explicit19.C > new file mode 100644 > index 00000000000..47903813680 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/cpp2a/explicit19.C > @@ -0,0 +1,12 @@ > +// Verify a conditional explicit-specifier is a SFINAE context. > +// { dg-do compile { target c++20 } } > + > +struct A { > + template explicit(T::value) A(T) = delete; > + A(...); > +}; > + > +struct B { static bool value; }; > + > +A x(0); > +A y(B{}); > diff --git a/gcc/testsuite/g++.dg/ext/integer-pack6.C b/gcc/testsuite/g++.dg/ext/integer-pack6.C > new file mode 100644 > index 00000000000..7e16bc44b40 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/ext/integer-pack6.C > @@ -0,0 +1,13 @@ > +// Verify a non-constant argument to __integer_pack is a SFINAE error. > +// { dg-do compile { target c++11 } } > + > +template struct A { }; > + > +template auto f(int) -> A<__integer_pack(T::value)...> = delete; > +template void f(...); > + > +struct B { static int value; }; > + > +int main() { > + f(0); > +}