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

	* pt.c (invalid_nontype_parm_type_p): Prohibit rvalue reference.
	(convert_nontype_argument): Revert earlier change.

From-SVN: r258605

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2957ebb7471e7f2c871fcea4d8b0640326ee7b67..fe7b32e67550f747abfdae3063a850d36ba6d386 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2018-03-16  Jason Merrill  <jason@redhat.com>
 
+       PR c++/84720 - ICE with rvalue ref non-type argument.
+       * pt.c (invalid_nontype_parm_type_p): Prohibit rvalue reference.
+       (convert_nontype_argument): Revert earlier change.
+
        PR c++/80227 - SFINAE and negative array size.
        * decl.c (compute_array_index_type): Use
        build_converted_constant_expr and valid_constant_size_p.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 32af3a4822e30f21e839d4948688a823688771fe..f7b1b0dd9aadf7e640cf54823b540c8cfba1101e 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6933,18 +6933,11 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain)
          return NULL_TREE;
        }
 
-      if (!glvalue_p (expr)
-         || TYPE_REF_IS_RVALUE (type) != xvalue_p (expr))
+      if (!lvalue_p (expr))
        {
          if (complain & tf_error)
-           {
-             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);
-           }
+           error ("%qE is not a valid template argument for type %qT "
+                  "because it is not an lvalue", expr, type);
          return NULL_TREE;
        }
 
@@ -23992,7 +23985,10 @@ invalid_nontype_parm_type_p (tree type, tsubst_flags_t complain)
 {
   if (INTEGRAL_OR_ENUMERATION_TYPE_P (type))
     return false;
-  else if (POINTER_TYPE_P (type))
+  else if (TYPE_PTR_P (type))
+    return false;
+  else if (TREE_CODE (type) == REFERENCE_TYPE
+          && !TYPE_REF_IS_RVALUE (type))
     return false;
   else if (TYPE_PTRMEM_P (type))
     return false;

diff --git a/gcc/testsuite/g++.dg/cpp0x/rv-targ1.C b/gcc/testsuite/g++.dg/cpp0x/rv-targ1.C
index b8e0daba0f75bf72a6c33ee3a60944df518a701f..06516dfa2b9c211c14d948595de203d7f20bb752 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/rv-targ1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/rv-targ1.C
@@ -1,7 +1,7 @@
 // PR c++/84720
 // { dg-do compile { target c++11 } }
 
-template<int &&>
+template<int &&>               // { dg-error "not a valid type" }
 struct a {
   template<typename...>
   static void b() {