From: Jason Merrill <jason@redhat.com>
Date: Wed, 22 Feb 2017 22:55:26 +0000 (-0500)
Subject: * pt.c (do_class_deduction): Handle 0 argument case.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=349c635163ea53a276c755a7bbcb278e1eefef3e;p=gcc.git

* pt.c (do_class_deduction): Handle 0 argument case.

From-SVN: r245665
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e69e2eafdf1..9d6a9a67c42 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 5b0f62d3832..17175bad45e 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 00000000000..e182803ae79
--- /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{};
+