From: Jason Merrill <jason@redhat.com>
Date: Fri, 6 Apr 2018 15:12:34 +0000 (-0400)
Subject: PR c++/85242 - ICE with class definition in template parm.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a82f886aa67b81ef2c8499b698c2803f262bb582;p=gcc.git

PR c++/85242 - ICE with class definition in template parm.

	* cp-tree.h (PROCESSING_REAL_TEMPLATE_DECL_P): False if
	processing_template_parmlist.

From-SVN: r259178
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 71eceaaa31b..71a5d45c194 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2018-04-06  Jason Merrill  <jason@redhat.com>
 
+	PR c++/85242 - ICE with class definition in template parm.
+	* cp-tree.h (PROCESSING_REAL_TEMPLATE_DECL_P): False if
+	processing_template_parmlist.
+
 	PR c++/85240 - LTO ICE with using of undeduced auto fn.
 	* cp-gimplify.c (cp_genericize_r): Discard using of undeduced auto.
 
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index dbe34c096f0..204791e51cf 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -4719,7 +4719,8 @@ more_aggr_init_expr_args_p (const aggr_init_expr_arg_iterator *iter)
    entity with its own template parameter list, and which is not a
    full specialization.  */
 #define PROCESSING_REAL_TEMPLATE_DECL_P() \
-  (processing_template_decl > template_class_depth (current_scope ()))
+  (!processing_template_parmlist \
+   && processing_template_decl > template_class_depth (current_scope ()))
 
 /* Nonzero if this VAR_DECL or FUNCTION_DECL has already been
    instantiated, i.e. its definition has been generated from the
diff --git a/gcc/testsuite/g++.dg/template/error58.C b/gcc/testsuite/g++.dg/template/error58.C
new file mode 100644
index 00000000000..cede1c94887
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/error58.C
@@ -0,0 +1,8 @@
+// PR c++/85242
+
+namespace N
+{
+  struct A {};
+}
+
+template<struct N::A {}> void foo(); // { dg-error "" }