Re: C++ PATCH for c++/88216, ICE with class type in non-type template parameter

[Marek Polacek <polacek@redhat.com>]

On Tue, Dec 11, 2018 at 10:48:17AM -0500, Jason Merrill wrote:
> On 12/10/18 2:52 PM, Marek Polacek wrote:
> > +  if (processing_template_decl && value_dependent_expression_p (expr))
> 
> You don't need to check processing_template_decl before
> value_dependent_expression_p.

Ok.
 
> I would lean toward checking for value-dependence in
> convert_nontype_argument, which already does that a lot.  Enough, actually,
> that perhaps we should remember the result in a local variable.

I've moved the call, but I didn't add a local variable for the result,
because I was afraid that, since EXPR is being modified on some of the
codepaths, its value-dependent-ness (is that a term?) may change.

Thanks,

Bootstrapped/regtested on x86_64-linux, ok for trunk?

2018-12-11  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.

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

diff --git gcc/cp/mangle.c gcc/cp/mangle.c
index 64415894bc5..56247883010 100644
--- gcc/cp/mangle.c
+++ 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 gcc/cp/pt.c gcc/cp/pt.c
index 8560e588593..3b378ee9ff4 100644
--- gcc/cp/pt.c
+++ 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 gcc/testsuite/g++.dg/cpp2a/nontype-class9.C gcc/testsuite/g++.dg/cpp2a/nontype-class9.C
new file mode 100644
index 00000000000..737f712be47
--- /dev/null
+++ 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);
+}