diff mbox series

c++: fix alias CTAD [PR114377]

Message ID sT5mQVdF83gALFpwo276_lGsa_qxCkMlluoino_kroEeDRk16ffcWy-9SfmeFqtFOQLg4x9dlrbmdz3V6HcIVobaZOolFGlIStvuHBvVLyM=@proton.me
State New
Headers show
Series c++: fix alias CTAD [PR114377] | expand

Commit Message

centurion March 25, 2024, 3:17 p.m. UTC 
From b34312d82b236601c348382d30e625558f37d40c Mon Sep 17 00:00:00 2001
From: centurion <centurion009@proton.me>
Date: Mon, 25 Mar 2024 01:57:21 +0400
Subject: [PATCH] c++: fix alias CTAD [PR114377]

PR c++/114377

gcc/cp/ChangeLog:

	PR c++/114377
	* 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.
---
 gcc/cp/pt.cc                                      |  3 ++-
 .../g++.dg/cpp2a/class-deduction-alias19.C        | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/class-deduction-alias19.C

Comments

centurion March 26, 2024, 10:04 a.m. UTC | #1 
The problem was that in cp/pt.cc:find_template_parameter_info::found compiler tried to get TEMPLATE_TEMPLATE_PARM tree from TEMPLATE_DECL tree by DECL_INITIAL instead of TREE_TYPE(like for TYPE_DECL).Therefore, parm got nullptr, because cp/pt.cc:process_template_parm doesn't assign anything to DECL_INITIAL for both TYPE_DECL and TEMPLATE_DECL.

On Monday, March 25th, 2024 at 7:17 PM, centurion <centurion009@proton.me> wrote:

> From b34312d82b236601c348382d30e625558f37d40c Mon Sep 17 00:00:00 2001
> From: centurion centurion009@proton.me
> 
> Date: Mon, 25 Mar 2024 01:57:21 +0400
> Subject: [PATCH] c++: fix alias CTAD [PR114377]
> 
> PR c++/114377
> 
> gcc/cp/ChangeLog:
> 
> PR c++/114377
> * 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.
> ---
> gcc/cp/pt.cc | 3 ++-
> .../g++.dg/cpp2a/class-deduction-alias19.C | 15 +++++++++++++++
> 2 files changed, 17 insertions(+), 1 deletion(-)
> create mode 100644 gcc/testsuite/g++.dg/cpp2a/class-deduction-alias19.C
> 
> diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
> index 8cf0d5b7a8d..d8a02f1cd7f 100644
> --- a/gcc/cp/pt.cc
> +++ b/gcc/cp/pt.cc
> @@ -11032,7 +11032,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" }
> +}
> --
> 2.44.0
centurion March 26, 2024, 10:05 a.m. UTC | #2 
The problem was is that in cp/pt.cc:find_template_parameter_info::found compiler tried to get TEMPLATE_TEMPLATE_PARM tree from TEMPLATE_DECL tree by DECL_INITIAL instead of TREE_TYPE(like for TYPE_DECL). Therefore, parm got nullptr, because cp/pt.cc:process_template_parm doesn't assign anything to DECL_INITIAL for both TYPE_DECL and TEMPLATE_DECL.

On Monday, March 25th, 2024 at 7:17 PM, centurion <centurion009@proton.me> wrote:

> From b34312d82b236601c348382d30e625558f37d40c Mon Sep 17 00:00:00 2001
> From: centurion centurion009@proton.me
> 
> Date: Mon, 25 Mar 2024 01:57:21 +0400
> Subject: [PATCH] c++: fix alias CTAD [PR114377]
> 
> PR c++/114377
> 
> gcc/cp/ChangeLog:
> 
> PR c++/114377
> * 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.
> ---
> gcc/cp/pt.cc | 3 ++-
> .../g++.dg/cpp2a/class-deduction-alias19.C | 15 +++++++++++++++
> 2 files changed, 17 insertions(+), 1 deletion(-)
> create mode 100644 gcc/testsuite/g++.dg/cpp2a/class-deduction-alias19.C
> 
> diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
> index 8cf0d5b7a8d..d8a02f1cd7f 100644
> --- a/gcc/cp/pt.cc
> +++ b/gcc/cp/pt.cc
> @@ -11032,7 +11032,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" }
> +}
> --
> 2.44.0
Patrick Palka March 27, 2024, 2:21 p.m. UTC | #3 
On Mon, 25 Mar 2024, centurion wrote:

> From b34312d82b236601c348382d30e625558f37d40c Mon Sep 17 00:00:00 2001
> From: centurion <centurion009@proton.me>
> Date: Mon, 25 Mar 2024 01:57:21 +0400
> Subject: [PATCH] c++: fix alias CTAD [PR114377]
> 
> PR c++/114377
> 
> gcc/cp/ChangeLog:
> 
> 	PR c++/114377
> 	* pt.cc (find_template_parameter_info::found): Use TREE_TYPE for
> 	TEMPLATE_DECL instead of DECL_INITIAL.

Makes sense, this is consistent with e.g. template_parm_to_arg.  LGTM!

> 
> gcc/testsuite/ChangeLog:
> 
> 	* g++.dg/cpp2a/class-deduction-alias19.C: New test.
> ---
>  gcc/cp/pt.cc                                      |  3 ++-
>  .../g++.dg/cpp2a/class-deduction-alias19.C        | 15 +++++++++++++++
>  2 files changed, 17 insertions(+), 1 deletion(-)
>  create mode 100644 gcc/testsuite/g++.dg/cpp2a/class-deduction-alias19.C
> 
> diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
> index 8cf0d5b7a8d..d8a02f1cd7f 100644
> --- a/gcc/cp/pt.cc
> +++ b/gcc/cp/pt.cc
> @@ -11032,7 +11032,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)

Style note: there should be a space before the ( of a function/macro call

>      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" }
> +}
> -- 
> 2.44.0
> 
> 
>
centurion March 27, 2024, 6:36 p.m. UTC | #4 
From 22056e95bde82b1dc45b8b611be4c8d756122b02 Mon Sep 17 00:00:00 2001
From: centurion <centurion009@proton.me>
Date: Wed, 27 Mar 2024 22:29:57 +0400
Subject: [PATCH] c++: fix alias CTAD [PR114377]

	PR c++/114377

gcc/cp/ChangeLog:

	PR c++/114377
	* 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.
---
 gcc/cp/pt.cc                                      |  3 ++-
 .../g++.dg/cpp2a/class-deduction-alias19.C        | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/class-deduction-alias19.C

diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index 7b00a8615d2..1425d6116d0 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -11032,7 +11032,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" }
+}
Jason Merrill April 4, 2024, 9:21 p.m. UTC | #5 
Applied, thanks!

BTW, in future please see

   https://gcc.gnu.org/contribute.html#legal

This patch is small enough to not need to worry about copyright, but for 
larger patches we would.

On 3/27/24 14:36, centurion wrote:
> 
> 	PR c++/114377
> 
> gcc/cp/ChangeLog:
> 
> 	PR c++/114377
> 	* 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.
> ---
>   gcc/cp/pt.cc                                      |  3 ++-
>   .../g++.dg/cpp2a/class-deduction-alias19.C        | 15 +++++++++++++++
>   2 files changed, 17 insertions(+), 1 deletion(-)
>   create mode 100644 gcc/testsuite/g++.dg/cpp2a/class-deduction-alias19.C
> 
> diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
> index 7b00a8615d2..1425d6116d0 100644
> --- a/gcc/cp/pt.cc
> +++ b/gcc/cp/pt.cc
> @@ -11032,7 +11032,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" }
> +}
diff mbox series

Patch

diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index 8cf0d5b7a8d..d8a02f1cd7f 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -11032,7 +11032,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" }
+}