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 CBFC73858D1E for ; Tue, 13 Sep 2022 13:46:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CBFC73858D1E 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=1663076804; 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=MhtkdO9tUc51Nph+SbR26CtvxBNTkEEuwSMSTIh8PGY=; b=eeazxSAN9kBmuC6Siy5lDLNBPGfaJ2zKX8l/E1aYtJOA/w9XW/uVXbjt0YQv6gLb+4kAw0 9c9rb0/XryrR2sZ4hlbaI+f+O1fc5lvSXRQbMciIls+EBpfxp+v9zK515i1FRcdD26izlg nSBiqYhK5nmqQUzIBgqPp4YafBgJyiA= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-348-a3LIH60MNBOe58myU86NWA-1; Tue, 13 Sep 2022 09:46:43 -0400 X-MC-Unique: a3LIH60MNBOe58myU86NWA-1 Received: by mail-qt1-f198.google.com with SMTP id o21-20020ac87c55000000b00344646ea2ccso9743295qtv.11 for ; Tue, 13 Sep 2022 06:46:43 -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=MhtkdO9tUc51Nph+SbR26CtvxBNTkEEuwSMSTIh8PGY=; b=syO6JYoYerupkX6UoA6aLE2unz8sa7Tcg9rp+ExkDvPrhYvY0mF9cl5AGIUMP4wwZr 7YKrvu+INq461y67o6x9NwOCiRHbRSbc8oYHdzI/mwOyXJOSV1p2L+D4NPnXqA/wJzAj idt269lh25fDLyLOqrqycC2l97NL2jlY3otfBEWBphkMph9qD8wTuLVc14+i5fUB4U9n sRiwzH7QhIGgo0hBZGI+MvnYoSbNBkt3qDwHyV1cSauhE/wlHigVJAA+vpU9azoa+TGg vZmsi0QVMm9NMxKmQMi8EQFIUbcujw1/0M6OJb+yaPwG9VC7HwY6SeDuYPx6vw/w2LbC ReKA== X-Gm-Message-State: ACgBeo22TQD2DjQlgZRuFrTk/oIOXJXWBv9bbgwX3nYitCo4Sqw1NQc+ gUUjs5fBWv+Rq+3cZ7U8i5hO9rwTbvbC3dN4PVtbzLGRje6U6hgfwnGDAB76kLHMakWdQ4a67v5 LmWGXUNBQVTeXZK077w== X-Received: by 2002:a05:6214:27c6:b0:4ac:94f9:c727 with SMTP id ge6-20020a05621427c600b004ac94f9c727mr15111866qvb.51.1663076802872; Tue, 13 Sep 2022 06:46:42 -0700 (PDT) X-Google-Smtp-Source: AA6agR5OjOjFkelWvb6lE/2Y0bJSh/fltQnRyAeitO5SWZFLh+LwAMzDMipDerkiRmcygu1swUJ0Ng== X-Received: by 2002:a05:6214:27c6:b0:4ac:94f9:c727 with SMTP id ge6-20020a05621427c600b004ac94f9c727mr15111838qvb.51.1663076802569; Tue, 13 Sep 2022 06:46:42 -0700 (PDT) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id e19-20020a05622a111300b003437a694049sm9270546qty.96.2022.09.13.06.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 06:46:41 -0700 (PDT) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Tue, 13 Sep 2022 09:46:40 -0400 (EDT) To: Jason Merrill cc: Patrick Palka , gcc-patches@gcc.gnu.org Subject: Re: [PATCH] c++: some missing-SFINAE fixes In-Reply-To: <30bb32f6-3f08-5a45-e39a-ae8f49bc4af0@redhat.com> Message-ID: <4336c12a-a7e0-a2ba-c39d-55d970865649@idea> References: <20220913114538.2741902-1-ppalka@redhat.com> <30bb32f6-3f08-5a45-e39a-ae8f49bc4af0@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,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 Tue, 13 Sep 2022, Jason Merrill wrote: > 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? Thanks -- sounds good, like the following incremental patch? -- >8 -- Subject: [PATCH] c++: two-parameter version of cxx_constant_value Since some callers need the complain parameter but not the object parameter, let's introduce and use an overload of cxx_constant_value that omits the latter. gcc/cp/ChangeLog: * cp-tree.h (cxx_constant_value): Define two-parameter version that omits the object parameter. * decl.cc (build_explicit_specifier): Omit NULL_TREE object argument to cxx_constant_value. * except.cc (build_noexcept_spec): Likewise. * pt.cc (expand_integer_pack): Likewise. (fold_targs_r): Likewise. * semantics.cc (finish_if_stmt_cond): Likewise. --- gcc/cp/cp-tree.h | 2 ++ gcc/cp/decl.cc | 2 +- gcc/cp/except.cc | 2 +- gcc/cp/pt.cc | 4 ++-- gcc/cp/semantics.cc | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 2ba44e80e20..1eb176d4a50 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -8414,6 +8414,8 @@ extern bool require_rvalue_constant_expression (tree); extern bool require_potential_rvalue_constant_expression (tree); extern tree cxx_constant_value (tree, tree = NULL_TREE, tsubst_flags_t = tf_error); +inline tree cxx_constant_value (tree t, tsubst_flags_t complain) +{ return cxx_constant_value (t, NULL_TREE, complain); } extern void cxx_constant_dtor (tree, tree); extern tree cxx_constant_init (tree, tree = NULL_TREE); extern tree maybe_constant_value (tree, tree = NULL_TREE, bool = false); diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 5404d7e084c..006e9affcba 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, NULL_TREE, complain); + expr = cxx_constant_value (expr, complain); return expr; } diff --git a/gcc/cp/except.cc b/gcc/cp/except.cc index 4d7f0ce102d..048612de400 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, NULL_TREE, complain); + expr = cxx_constant_value (expr, complain); } if (TREE_CODE (expr) == INTEGER_CST) { diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 074179288b6..db4e808adec 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, NULL_TREE, complain); + hi = cxx_constant_value (hi, 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 @@ -20121,7 +20121,7 @@ fold_targs_r (tree targs, tsubst_flags_t complain) && !glvalue_p (elt) && !TREE_CONSTANT (elt)) { - elt = cxx_constant_value (elt, NULL_TREE, complain); + elt = cxx_constant_value (elt, complain); if (elt == error_mark_node) return false; } diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 3edefb2fca2..4f189978484 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -1042,7 +1042,7 @@ finish_if_stmt_cond (tree orig_cond, tree if_stmt) { maybe_warn_for_constant_evaluated (cond, /*constexpr_if=*/true); cond = instantiate_non_dependent_expr (cond); - cond = cxx_constant_value (cond, NULL_TREE); + cond = cxx_constant_value (cond); } else { -- 2.37.3.542.gdd3f6c4cae > > > 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); > > +} > >