public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-1793] c++: alias CTAD and aggregate deduction cand [PR98832]
@ 2021-06-24 17:13 Patrick Palka
0 siblings, 0 replies; only message in thread
From: Patrick Palka @ 2021-06-24 17:13 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:c761be53f6b62e22ac5de18c4aaf88648f64f5b7
commit r12-1793-gc761be53f6b62e22ac5de18c4aaf88648f64f5b7
Author: Patrick Palka <ppalka@redhat.com>
Date: Thu Jun 24 13:11:44 2021 -0400
c++: alias CTAD and aggregate deduction cand [PR98832]
During alias CTAD, we're accidentally ignoring the aggregate deduction
candidate for the underlying template because this guide is added
separately via maybe_aggr_guide (which doesn't yet handle alias
templates) instead of via deduction_guides_for (which does). This patch
makes maybe_aggr_guide handle alias templates in a manner similar to
deduction_guides_for.
PR c++/98832
gcc/cp/ChangeLog:
* pt.c (maybe_aggr_guide): Handle alias templates appropriately.
gcc/testsuite/ChangeLog:
* g++.dg/cpp2a/class-deduction-alias9.C: New test.
Diff:
---
gcc/cp/pt.c | 11 +++++++++++
gcc/testsuite/g++.dg/cpp2a/class-deduction-alias9.C | 6 ++++++
2 files changed, 17 insertions(+)
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 1af81208e26..f73c7471a33 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -28886,6 +28886,8 @@ is_spec_or_derived (tree etype, tree tmpl)
return !err;
}
+static tree alias_ctad_tweaks (tree, tree);
+
/* Return a C++20 aggregate deduction candidate for TYPE initialized from
INIT. */
@@ -28898,6 +28900,15 @@ maybe_aggr_guide (tree tmpl, tree init, vec<tree,va_gc> *args)
if (init == NULL_TREE)
return NULL_TREE;
+ if (DECL_ALIAS_TEMPLATE_P (tmpl))
+ {
+ tree under = DECL_ORIGINAL_TYPE (DECL_TEMPLATE_RESULT (tmpl));
+ tree tinfo = get_template_info (under);
+ if (tree guide = maybe_aggr_guide (TI_TEMPLATE (tinfo), init, args))
+ return alias_ctad_tweaks (tmpl, guide);
+ return NULL_TREE;
+ }
+
/* We might be creating a guide for a class member template, e.g.,
template<typename U> struct A {
diff --git a/gcc/testsuite/g++.dg/cpp2a/class-deduction-alias9.C b/gcc/testsuite/g++.dg/cpp2a/class-deduction-alias9.C
new file mode 100644
index 00000000000..5cc7b7c1a80
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/class-deduction-alias9.C
@@ -0,0 +1,6 @@
+// PR c++/98832
+// { dg-do compile { target c++20 } }
+
+template<class T, class U> struct X { U u; };
+template<class T> using Y = X<int, T>;
+Y y{0};
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-24 17:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-24 17:13 [gcc r12-1793] c++: alias CTAD and aggregate deduction cand [PR98832] Patrick Palka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).