From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 8539E3858D1E; Wed, 4 May 2022 21:09:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8539E3858D1E 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-123] c++: ICE during aggr CTAD for member tmpl [PR105476] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: 1cd3faf5dddb3cbfa2ed308ecf3db4f70bff337e X-Git-Newrev: 8a98e3ff7e80bf2936f163d50309fd88d72564a0 Message-Id: <20220504210911.8539E3858D1E@sourceware.org> Date: Wed, 4 May 2022 21:09:11 +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: Wed, 04 May 2022 21:09:11 -0000 https://gcc.gnu.org/g:8a98e3ff7e80bf2936f163d50309fd88d72564a0 commit r13-123-g8a98e3ff7e80bf2936f163d50309fd88d72564a0 Author: Patrick Palka Date: Wed May 4 17:08:08 2022 -0400 c++: ICE during aggr CTAD for member tmpl [PR105476] Here we're crashing from maybe_aggr_guide ultimately because processing_template_decl isn't set when partially instantiating the guide's parameter list; this causes us to force completion of the dependent type Visitor_functior, which of course fails and results in an unexpected error_mark_node (the instantation should always succeed). PR c++/105476 gcc/cp/ChangeLog: * pt.cc (maybe_aggr_guide): Set processing_template_decl when partially instantiating the guide's parameter list. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/class-deduction-aggr13.C: New test. * g++.dg/cpp2a/class-deduction-aggr13a.C: New test. Diff: --- gcc/cp/pt.cc | 6 +++++- gcc/testsuite/g++.dg/cpp2a/class-deduction-aggr13.C | 11 +++++++++++ gcc/testsuite/g++.dg/cpp2a/class-deduction-aggr13a.C | 18 ++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index ac002907a41..2bec47dc295 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -29569,7 +29569,11 @@ maybe_aggr_guide (tree tmpl, tree init, vec *args) PARMS, so that its template level is properly reduced and we don't get mismatches when deducing types using the guide with PARMS. */ if (member_template_p) - parms = tsubst (parms, DECL_TI_ARGS (tmpl), complain, init); + { + ++processing_template_decl; + parms = tsubst (parms, DECL_TI_ARGS (tmpl), complain, init); + --processing_template_decl; + } } else if (TREE_CODE (init) == TREE_LIST) { diff --git a/gcc/testsuite/g++.dg/cpp2a/class-deduction-aggr13.C b/gcc/testsuite/g++.dg/cpp2a/class-deduction-aggr13.C new file mode 100644 index 00000000000..d3b21c722c8 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/class-deduction-aggr13.C @@ -0,0 +1,11 @@ +// PR c++/105476 +// { dg-do compile { target c++17 } } + +template struct Visitor_functor; + +template struct Events { + template struct Visitor : Visitor_functor::type_t... { }; +}; + +using ev_t = Events; +ev_t::Visitor v = { {} }; // { dg-error "too many initializers" } diff --git a/gcc/testsuite/g++.dg/cpp2a/class-deduction-aggr13a.C b/gcc/testsuite/g++.dg/cpp2a/class-deduction-aggr13a.C new file mode 100644 index 00000000000..69ae5dd4b60 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/class-deduction-aggr13a.C @@ -0,0 +1,18 @@ +// PR c++/105476 +// { dg-do compile { target c++20 } } +// A valid version of class-deduction-aggr13.C. + +template struct Visitor_functor; + +template<> struct Visitor_functor { + using type_t = int; +}; + +template struct Events { + template struct Visitor { + Visitor_functor::type_t t; + }; +}; + +using ev_t = Events; +ev_t::Visitor v = { {} };