From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 987C53858421; Wed, 15 Mar 2023 12:45:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 987C53858421 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678884320; bh=nDSIWlzDHLlOoGY4I5073C01i8b6UjCGTrAps+x5xG0=; h=From:To:Subject:Date:From; b=qOCBGOYHXEJGJZt8a7uu5e2AJlAgk2sI3wQiP1tynvz2VrE2K8KKtL2NaEqbMeYWt k3aZiPW05P7Lgn8RxKr3uSjzHXhRIvYSOrWe1zQNOnMKeYsCFCfAsxrdX7A8a40iAK 2zr092FwDFQxR4GoeOr0ejZqssu3jI6Lnqi4H9ss= 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 r13-6694] c++: injected class name as default ttp arg [PR58538] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 3ea64aad06a2b32739028bae03b9b9a5691d2d30 X-Git-Newrev: 40c1352c5a4530350012d6a922435cf491663daa Message-Id: <20230315124520.987C53858421@sourceware.org> Date: Wed, 15 Mar 2023 12:45:20 +0000 (GMT) List-Id: https://gcc.gnu.org/g:40c1352c5a4530350012d6a922435cf491663daa commit r13-6694-g40c1352c5a4530350012d6a922435cf491663daa Author: Jason Merrill Date: Tue Mar 14 23:16:21 2023 -0400 c++: injected class name as default ttp arg [PR58538] This function needs to handle this case like convert_template_argument. PR c++/58538 gcc/cp/ChangeLog: * semantics.cc (check_template_template_default_arg): Check maybe_get_template_decl_from_type_decl. gcc/testsuite/ChangeLog: * g++.dg/template/ttp7.C: Remove expected error. Diff: --- gcc/cp/semantics.cc | 9 +++++++-- gcc/testsuite/g++.dg/template/ttp7.C | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index d67a9b26719..57dd7b66da8 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -3468,8 +3468,13 @@ check_template_template_default_arg (tree argument) && TREE_CODE (argument) != UNBOUND_CLASS_TEMPLATE) { if (TREE_CODE (argument) == TYPE_DECL) - error ("invalid use of type %qT as a default value for a template " - "template-parameter", TREE_TYPE (argument)); + { + if (tree t = maybe_get_template_decl_from_type_decl (argument)) + if (TREE_CODE (t) == TEMPLATE_DECL) + return t; + error ("invalid use of type %qT as a default value for a template " + "template-parameter", TREE_TYPE (argument)); + } else error ("invalid default argument for a template template parameter"); return error_mark_node; diff --git a/gcc/testsuite/g++.dg/template/ttp7.C b/gcc/testsuite/g++.dg/template/ttp7.C index 0bcaa8f7292..672077e7e7d 100644 --- a/gcc/testsuite/g++.dg/template/ttp7.C +++ b/gcc/testsuite/g++.dg/template/ttp7.C @@ -11,6 +11,6 @@ template class = A<0> > struct B2 {}; // { dg-error "as a default template struct S { - template