From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 4ED6F385E446; Mon, 28 Mar 2022 13:37:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4ED6F385E446 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-7848] c++: ICE with alias in pack expansion [PR103769] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/master X-Git-Oldrev: 52f42dce15f036a140154aa339fa1709c5cc858b X-Git-Newrev: 07be8f8da4c6840a1fd6b2229b147e50cc6f03dc Message-Id: <20220328133707.4ED6F385E446@sourceware.org> Date: Mon, 28 Mar 2022 13:37:07 +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: Mon, 28 Mar 2022 13:37:07 -0000 https://gcc.gnu.org/g:07be8f8da4c6840a1fd6b2229b147e50cc6f03dc commit r12-7848-g07be8f8da4c6840a1fd6b2229b147e50cc6f03dc Author: Jason Merrill Date: Fri Mar 25 11:26:06 2022 -0400 c++: ICE with alias in pack expansion [PR103769] This was breaking because when we stripped the 't' typedef in s...> to be s, the TYPE_MAIN_VARIANT of "Args..." was still "t...", because type pack expansions are treated as types. Fixed by using the right function to copy a "type". PR c++/99445 PR c++/103769 gcc/cp/ChangeLog: * tree.cc (strip_typedefs): Use build_distinct_type_copy. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/variadic-alias5.C: New test. Diff: --- gcc/cp/tree.cc | 2 +- gcc/testsuite/g++.dg/cpp0x/variadic-alias5.C | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/cp/tree.cc b/gcc/cp/tree.cc index eb59e56610b..492921721f2 100644 --- a/gcc/cp/tree.cc +++ b/gcc/cp/tree.cc @@ -1791,7 +1791,7 @@ strip_typedefs (tree t, bool *remove_attributes, unsigned int flags) Ts pack, resulting in an error. */ if (type != pat && uses_parameter_packs (type)) { - result = copy_node (t); + result = build_distinct_type_copy (t); PACK_EXPANSION_PATTERN (result) = type; } } diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic-alias5.C b/gcc/testsuite/g++.dg/cpp0x/variadic-alias5.C new file mode 100644 index 00000000000..70956c91838 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic-alias5.C @@ -0,0 +1,9 @@ +// PR c++/103769 +// { dg-do compile { target c++11 } } +// { dg-additional-options "--param=hash-table-verification-limit=1000" } + +template using t = T; +template struct s {}; +template s...> f() { return {};} + +int main() { f(); }