PR c++/88216 - ICE with class type in non-type template parameter.

	* mangle.c (write_expression): Handle TARGET_EXPR and
	VIEW_CONVERT_EXPR.
	* pt.c (convert_nontype_argument): Don't call
	get_template_parm_object for value-dependent expressions.

	* g++.dg/cpp2a/nontype-class9.C: New test.

From-SVN: r267108

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 503bbbb7598a2066bb204e2b55d1ac639e41dd71..46557bec5c22381b9fd5c32e2554f6a99899cb4f 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2018-12-13  Marek Polacek  <polacek@redhat.com>
+
+       PR c++/88216 - ICE with class type in non-type template parameter.
+       * mangle.c (write_expression): Handle TARGET_EXPR and
+       VIEW_CONVERT_EXPR.
+       * pt.c (convert_nontype_argument): Don't call
+       get_template_parm_object for value-dependent expressions.
+
 2018-12-13  Nathan Sidwell  <nathan@acm.org>
 
        PR c++/87531

diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 64415894bc57c3f6fb80f46365d5a12f858dc74e..56247883010b624375da3da7502ea4f782c024e7 100644 (file)
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -2836,13 +2836,21 @@ write_expression (tree expr)
 {
   enum tree_code code = TREE_CODE (expr);
 
+  if (TREE_CODE (expr) == TARGET_EXPR)
+    {
+      expr = TARGET_EXPR_INITIAL (expr);
+      code = TREE_CODE (expr);
+    }
+
   /* Skip NOP_EXPR and CONVERT_EXPR.  They can occur when (say) a pointer
      argument is converted (via qualification conversions) to another type.  */
   while (CONVERT_EXPR_CODE_P (code)
         || location_wrapper_p (expr)
         /* Parentheses aren't mangled.  */
         || code == PAREN_EXPR
-        || code == NON_LVALUE_EXPR)
+        || code == NON_LVALUE_EXPR
+        || (code == VIEW_CONVERT_EXPR
+            && TREE_CODE (TREE_OPERAND (expr, 0)) == TEMPLATE_PARM_INDEX))
     {
       expr = TREE_OPERAND (expr, 0);
       code = TREE_CODE (expr);

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 8560e588593397950d6eedafc3e199d58a24864c..3b378ee9ff48b328dec5b0590188270e9ca4b430 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -7123,7 +7123,8 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain)
     {
       /* Replace the argument with a reference to the corresponding template
         parameter object.  */
-      expr = get_template_parm_object (expr, complain);
+      if (!value_dependent_expression_p (expr))
+       expr = get_template_parm_object (expr, complain);
       if (expr == error_mark_node)
        return NULL_TREE;
     }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 19c82c17b467e844d3dd1c946b51b2d3d4a6fe0a..a3076872723d6914274259ea685b89eba5b87ac2 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-12-13  Marek Polacek  <polacek@redhat.com>
+
+       PR c++/88216 - ICE with class type in non-type template parameter.
+       * g++.dg/cpp2a/nontype-class9.C: New test.
+
 2018-12-13  Jakub Jelinek  <jakub@redhat.com>
 
        PR rtl-optimization/88416

diff --git a/gcc/testsuite/g++.dg/cpp2a/nontype-class9.C b/gcc/testsuite/g++.dg/cpp2a/nontype-class9.C
new file mode 100644 (file)
index 0000000..737f712
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/nontype-class9.C
@@ -0,0 +1,29 @@
+// PR c++/88216
+// { dg-do compile { target c++2a } }
+
+template <class T, class U> struct same;
+template <class T> struct same<T,T> {};
+
+struct T { };
+
+template <T t>
+struct U { };
+
+template <T t>
+void f (U<t>)
+{
+  same<T,decltype(t)> s;
+  same<const T&,decltype((t))> s2;
+}
+
+template<T t>
+U<t> u;
+
+T t;
+U<t> u2;
+
+void
+g ()
+{
+  f<t>(u2);
+}