From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id DA3773858D1E; Tue, 13 Sep 2022 13:49:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DA3773858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663076940; bh=XzHeefn8/YpIL/2zz0jhEj8faKipizhu2/RpP21IJf0=; h=From:To:Subject:Date:From; b=DBFlyekuioB6WlcYxcpxXUqD+oNA7WZG6UTCQfwn00QHLLhTkZlTsYIf6zY+06LOR EvifqE1muk+hjeuszzjJOzHXhppfC3iTSROhdtTfQ5dO1ao2jSFqI8Sov6pP/nFaiL NYr+JgLVfsV6UWtUzxiwIWoqeB6oBctlpIBaRHWs= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-2645] c++: some missing-SFINAE fixes X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: 48e40d0b658c0b7989dfbe67468430b532bcbbe9 X-Git-Newrev: 441a4880cba0908e58a102b068095e4ac2bb46cc Message-Id: <20220913134900.DA3773858D1E@sourceware.org> Date: Tue, 13 Sep 2022 13:49:00 +0000 (GMT) List-Id: https://gcc.gnu.org/g:441a4880cba0908e58a102b068095e4ac2bb46cc commit r13-2645-g441a4880cba0908e58a102b068095e4ac2bb46cc Author: Patrick Palka Date: Tue Sep 13 09:48:04 2022 -0400 c++: some missing-SFINAE fixes 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 in the usual way, by passing complain and propagating error_mark_node appropriately. 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. Diff: --- gcc/cp/decl.cc | 2 +- gcc/cp/except.cc | 2 +- gcc/cp/pt.cc | 4 +++- 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, 42 insertions(+), 3 deletions(-) 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); 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..074179288b6 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,6 +14312,8 @@ 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 (spec == error_mark_node) + return error_mark_node; 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..491df4d58b7 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/noexcept-type26.C @@ -0,0 +1,12 @@ +// Verify a non-constant conditional noexcept-specifier in a function type +// respects SFINAE. +// { 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..dc43116128b --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/integer-pack6.C @@ -0,0 +1,13 @@ +// Verify a non-constant argument to __integer_pack respects SFINAE. +// { 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); +}