From: Jason Merrill <jason@redhat.com>
Date: Tue, 13 Mar 2018 18:58:15 +0000 (-0400)
Subject: PR c++/84720 - ICE with rvalue ref non-type argument.
X-Git-Tag: basepoints/gcc-9~703
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f71c1a187b70b88d90263b209ea402fc38d4ec92;p=thirdparty%2Fgcc.git

PR c++/84720 - ICE with rvalue ref non-type argument.

	* pt.c (convert_nontype_argument): Handle rvalue references.

From-SVN: r258501
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6e2958bc8e9b..23079f059231 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2018-03-13  Jason Merrill  <jason@redhat.com>
 
+	PR c++/84720 - ICE with rvalue ref non-type argument.
+	* pt.c (convert_nontype_argument): Handle rvalue references.
+
 	PR c++/84839 - ICE with decltype of parameter pack.
 	* pt.c (tsubst_pack_expansion): Set cp_unevaluated_operand while
 	instantiating dummy parms.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index fdc1c9a7a758..a16aef6bf58e 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6932,11 +6932,18 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain)
 	  return NULL_TREE;
 	}
 
-      if (!lvalue_p (expr))
+      if (!glvalue_p (expr)
+	  || TYPE_REF_IS_RVALUE (type) != xvalue_p (expr))
 	{
 	  if (complain & tf_error)
-	    error ("%qE is not a valid template argument for type %qT "
-		   "because it is not an lvalue", expr, type);
+	    {
+	      if (TYPE_REF_IS_RVALUE (type))
+		error ("%qE is not a valid template argument for type %qT "
+		       "because it is not an xvalue", expr, type);
+	      else
+		error ("%qE is not a valid template argument for type %qT "
+		       "because it is not an lvalue", expr, type);
+	    }
 	  return NULL_TREE;
 	}
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-targ1.C b/gcc/testsuite/g++.dg/cpp0x/rv-targ1.C
new file mode 100644
index 000000000000..b8e0daba0f75
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-targ1.C
@@ -0,0 +1,10 @@
+// PR c++/84720
+// { dg-do compile { target c++11 } }
+
+template<int &&>
+struct a {
+  template<typename...>
+  static void b() {
+    b();
+  }
+};