aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2017-02-22 17:55:26 -0500
committerJason Merrill <jason@gcc.gnu.org>2017-02-22 17:55:26 -0500
commit349c635163ea53a276c755a7bbcb278e1eefef3e (patch)
tree3e5eabdf13a765f422917148cb31054ea46c23f9
parente40b6fc7a16e78d6c806545dbe64430db003a66a (diff)
downloadgcc-349c635163ea53a276c755a7bbcb278e1eefef3e.zip
gcc-349c635163ea53a276c755a7bbcb278e1eefef3e.tar.gz
gcc-349c635163ea53a276c755a7bbcb278e1eefef3e.tar.bz2
* pt.c (do_class_deduction): Handle 0 argument case.
From-SVN: r245665
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/pt.c8
-rw-r--r--gcc/testsuite/g++.dg/cpp1z/class-deduction30.C6
3 files changed, 18 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e69e2ea..9d6a9a6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2017-02-22 Jason Merrill <jason@redhat.com>
+
+ * pt.c (do_class_deduction): Handle 0 argument case.
+
2017-02-22 Jakub Jelinek <jakub@redhat.com>
PR c++/79664
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 5b0f62d..17175ba 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -25126,6 +25126,14 @@ do_class_deduction (tree ptype, tree tmpl, tree init, int flags,
if (cands == NULL_TREE)
{
+ if (args->length() == 0)
+ {
+ /* Try tmpl<>. */
+ tree t = lookup_template_class (tmpl, NULL_TREE, NULL_TREE,
+ NULL_TREE, false, tf_none);
+ if (t != error_mark_node)
+ return t;
+ }
error ("cannot deduce template arguments for %qT, as it has "
"no deduction guides or user-declared constructors", type);
return error_mark_node;
diff --git a/gcc/testsuite/g++.dg/cpp1z/class-deduction30.C b/gcc/testsuite/g++.dg/cpp1z/class-deduction30.C
new file mode 100644
index 0000000..e182803
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/class-deduction30.C
@@ -0,0 +1,6 @@
+// { dg-options -std=c++1z }
+
+template <class T = void> struct A { };
+
+A a{};
+