From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jason@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2122)
	id D5FCE384AB48; Wed,  1 May 2024 20:31:53 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D5FCE384AB48
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1714595513;
	bh=qEMhZ6kVWxz4Od2/gjOolfP5/B9s7s4/x+AGBsIZUiY=;
	h=From:To:Subject:Date:From;
	b=F+12jvTWneJvhuPmBoe4bITOUcIeXRakoDgxQwF3WZXjDYCQCDksOoK2JGCZnHZpU
	 OV/vxKHLE+45LwKIldHNc2M9DtVuGxOU+lRnvggRMwrU+En4gcj0Kx/mc0OO2AfCsK
	 U9Km86qEKWBQMWGOEIfxQuiPj118K7sZyDyO3JkE=
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jason Merrill <jason@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-8669] c++: alias CTAD and template template parm [PR114377]
X-Act-Checkin: gcc
X-Git-Author: centurion <centurion009@proton.me>
X-Git-Refname: refs/heads/releases/gcc-13
X-Git-Oldrev: 7bc362ea61e5bf552356aa862beb7845fe50a47c
X-Git-Newrev: 60e1e13f458f1fcfb05a30ace57fa682461e2732
Message-Id: <20240501203153.D5FCE384AB48@sourceware.org>
Date: Wed,  1 May 2024 20:31:53 +0000 (GMT)
List-Id: <gcc-cvs.sourceware.org>

https://gcc.gnu.org/g:60e1e13f458f1fcfb05a30ace57fa682461e2732

commit r13-8669-g60e1e13f458f1fcfb05a30ace57fa682461e2732
Author: centurion <centurion009@proton.me>
Date:   Wed Mar 27 18:36:37 2024 +0000

    c++: alias CTAD and template template parm [PR114377]
    
    To match all the other places that pull a _TEMPLATE_PARM out of a
    _DECL (get_template_parm_index, etc.).
    
    This change is too small to be legally significant for copyright.
    
            PR c++/114377
    
    gcc/cp/ChangeLog:
    
            * pt.cc (find_template_parameter_info::found): Use TREE_TYPE for
            TEMPLATE_DECL instead of DECL_INITIAL.
    
    gcc/testsuite/ChangeLog:
    
            * g++.dg/cpp2a/class-deduction-alias19.C: New test.
    
    Reviewed-by: Jason Merrill <jason@redhat.com>
    (cherry picked from commit 801e82acd6b4f0cf863529875947e394899ea7b9)

Diff:
---
 gcc/cp/pt.cc                                         |  3 ++-
 gcc/testsuite/g++.dg/cpp2a/class-deduction-alias19.C | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index a768d11c82f..fa660fcf49e 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -10917,7 +10917,8 @@ find_template_parameter_info::found (tree parm)
 {
   if (TREE_CODE (parm) == TREE_LIST)
     parm = TREE_VALUE (parm);
-  if (TREE_CODE (parm) == TYPE_DECL)
+  if (TREE_CODE (parm) == TYPE_DECL
+      || TREE_CODE (parm) == TEMPLATE_DECL)
     parm = TREE_TYPE (parm);
   else
     parm = DECL_INITIAL (parm);
diff --git a/gcc/testsuite/g++.dg/cpp2a/class-deduction-alias19.C b/gcc/testsuite/g++.dg/cpp2a/class-deduction-alias19.C
new file mode 100644
index 00000000000..1ea79bd7691
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/class-deduction-alias19.C
@@ -0,0 +1,15 @@
+// PR c++/114377
+// { dg-do compile { target c++20 } }
+
+template <template <typename> typename Iterator>
+struct K {};
+
+template <typename C, typename IteratorPolicy>
+class Foo {};
+
+template <typename C, template<typename> typename TTP>
+using Bar = Foo<C, K<TTP>>;
+
+void s() {
+    Bar(1); // { dg-error "failed|no match" }
+}