From 2fcefcb2adf350d3163866e5754e4569f41551fd Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Mon, 29 Jun 2009 19:18:46 -0400
Subject: [PATCH] re PR c++/40274 (Revision 145566 caused ICE in tsubst, at
 cp/pt.c:9289)

	PR c++/40274
	* error.c (dump_template_parms): Pass all args to
	count_non_default_template_args.
	(count_non_default_template_args): Pull out the inner ones.

From-SVN: r149067
---
 gcc/testsuite/ChangeLog                |  5 +++++
 gcc/testsuite/g++.dg/template/debug1.C | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/template/debug1.C

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3adb59d22a31..03e3a0436904 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-29  Jason Merrill  <jason@redhat.com>
+
+	PR c++/40274
+	* g++.dg/template/debug1.C: New.
+
 2009-06-29  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/40580
diff --git a/gcc/testsuite/g++.dg/template/debug1.C b/gcc/testsuite/g++.dg/template/debug1.C
new file mode 100644
index 000000000000..a2c1577029b4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/debug1.C
@@ -0,0 +1,18 @@
+// PR c++/40274
+// { dg-options "-g" }
+
+template <class T> struct valuelist_types
+{
+ struct null { };
+ template <T V, class next=null> struct list { };
+};
+
+template <unsigned D> void foo()
+{
+ typename valuelist_types<unsigned>::template list<D> v;
+}
+
+void bar()
+{
+ valuelist_types<unsigned>::list<2> v;
+}