From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 5CDA3385802D; Tue, 5 Oct 2021 19:36:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5CDA3385802D 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 r12-4196] c++: unifying equal NONTYPE_ARGUMENT_PACKs [PR102547] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: ec0124e0acb556cdf5dba0e8d0ca6b69d9537fcc X-Git-Newrev: d4c470c376b4cb82c9a0b7e8a4b88c44d5e4289d Message-Id: <20211005193635.5CDA3385802D@sourceware.org> Date: Tue, 5 Oct 2021 19:36:35 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Oct 2021 19:36:35 -0000 https://gcc.gnu.org/g:d4c470c376b4cb82c9a0b7e8a4b88c44d5e4289d commit r12-4196-gd4c470c376b4cb82c9a0b7e8a4b88c44d5e4289d Author: Patrick Palka Date: Tue Oct 5 15:35:21 2021 -0400 c++: unifying equal NONTYPE_ARGUMENT_PACKs [PR102547] Here during partial ordering of the two partial specializations we end up in unify with parm=arg=NONTYPE_ARGUMENT_PACK, and crash shortly thereafter because uses_template_parms(parms) calls potential_const_expr which doesn't handle NONTYPE_ARGUMENT_PACK. This patch fixes this by extending potential_constant_expression to handle NONTYPE_ARGUMENT_PACK appropriately. PR c++/102547 gcc/cp/ChangeLog: * constexpr.c (potential_constant_expression_1): Handle NONTYPE_ARGUMENT_PACK. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/variadic-partial2.C: New test. * g++.dg/cpp0x/variadic-partial2a.C: New test. Diff: --- gcc/cp/constexpr.c | 10 ++++++++++ gcc/testsuite/g++.dg/cpp0x/variadic-partial2.C | 16 ++++++++++++++++ gcc/testsuite/g++.dg/cpp0x/variadic-partial2a.C | 22 ++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 18d9d117a48..e95ff00774f 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -9043,6 +9043,16 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, bool now, case CO_RETURN_EXPR: return false; + case NONTYPE_ARGUMENT_PACK: + { + tree args = ARGUMENT_PACK_ARGS (t); + int len = TREE_VEC_LENGTH (args); + for (int i = 0; i < len; ++i) + if (!RECUR (TREE_VEC_ELT (args, i), any)) + return false; + return true; + } + default: if (objc_non_constant_expr_p (t)) return false; diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-partial2.C b/gcc/testsuite/g++.dg/cpp0x/variadic-partial2.C new file mode 100644 index 00000000000..df61f26a3c1 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic-partial2.C @@ -0,0 +1,16 @@ +// PR c++/102547 +// { dg-do compile { target c++11 } } + +template +struct vals { }; + +template +struct vals_client { }; + +template +struct vals_client, T> { }; + +template +struct vals_client, void> { }; + +template struct vals_client, void>; //- "sorry, unimplemented..., ICE" diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-partial2a.C b/gcc/testsuite/g++.dg/cpp0x/variadic-partial2a.C new file mode 100644 index 00000000000..e98bdbbc07b --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic-partial2a.C @@ -0,0 +1,22 @@ +// PR c++/102547 +// { dg-do compile { target c++11 } } +// A version of variadic-partial2.C where partial ordering is performed +// on function templates instead of class templates. + +template +struct vals { }; + +template +void f(V, T) { }; + +template +void f(vals, T) { }; + +template +void f(vals, char) { }; + +template void f(vals<1, 2>, char); //- "sorry, unimplemented..., ICE" + +int main() { + f(vals<1, 3>{}, 'a'); //- "sorry, unimplemented..., ICE" +}