When determining whether to rule out initializer-list constructors
during CTAD with a single-element initializer list (as per P0702), the
element type's cv-qualifiers should be irrelevant. This patch fixes
this by making is_spec_or_derived strip cv-qualifiers from the supplied
expression type.
In passing, I noticed in maybe_aggr_guide we were calling
is_spec_or_derived with swapped arguments. This led us to prefer the
aggregate deduction candidate over copying deduction in the second
testcase below with -std=c++20.
gcc/cp/ChangeLog:
PR c++/99103
* pt.c (is_spec_or_derived): Drop cv-qualifiers from 'etype'.
(maybe_aggr_guide): Fix order of arguments to is_spec_or_derived.
gcc/testsuite/ChangeLog:
PR c++/99103
* g++.dg/cpp1z/class-deduction79.C: New test.
* g++.dg/cpp1z/class-deduction80.C: New test.
if (!etype || !CLASS_TYPE_P (etype))
return false;
+ etype = cv_unqualified (etype);
tree type = TREE_TYPE (tmpl);
tree tparms = (INNERMOST_TEMPLATE_PARMS
(DECL_TEMPLATE_PARMS (tmpl)));
if (args->length() == 1)
{
tree val = (*args)[0];
- if (is_spec_or_derived (tmpl, TREE_TYPE (val)))
+ if (is_spec_or_derived (TREE_TYPE (val), tmpl))
return NULL_TREE;
}
--- /dev/null
+// PR c++/99103
+// { dg-do compile { target c++17 } }
+#include <initializer_list>
+
+template <class T>
+struct S { S(std::initializer_list<T>); };
+
+extern const S<int> x;
+using type = decltype(S{x});
+using type = S<int>; // not S<S<int>>
--- /dev/null
+// PR c++/99103
+// { dg-do compile { target c++17 } }
+
+template <class T> struct X { T a; };
+template <class T> struct Y : X<T> {};
+
+extern const Y<int> y;
+using type = decltype(X{y});
+using type = X<int>; // not X<Y<int>>