From a5fcc8951b1107c6fd32b670e0e9919e53349bcf Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@codesourcery.com>
Date: Mon, 24 Mar 2003 19:41:10 +0000
Subject: [PATCH] re PR c++/10119 (tree-checking ICE in dump_expr)

cp:
	PR c++/10119
	* error.c (dump_expr) [BASELINK]: Use dump_expr.
	* pt.c (maybe_fold_nontype_args): New function.
	(tsubst_copy) [SCOPE_REF]: Subst any template_id args.
	[TEMPLATE_ID_EXPR]: Break out folding code, call it.
	(tsubst_copy_and_build) [TEMPLATE_ID_EXPR]: Call
	maybe_fold_nontype_args.
testsuite:
	PR c++/10119
	* g++.dg/template/ptrmem5.C: New test.

From-SVN: r64814
---
 gcc/cp/ChangeLog                        | 10 ++++++++++
 gcc/testsuite/ChangeLog                 |  3 +++
 gcc/testsuite/g++.dg/template/ptrmem5.C | 25 +++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/template/ptrmem5.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5ffb1440a5f..8cc29882ab9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,13 @@
+2003-03-24  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/10119
+	* error.c (dump_expr) [BASELINK]: Use dump_expr.
+	* pt.c (maybe_fold_nontype_args): New function.
+	(tsubst_copy) [SCOPE_REF]: Subst any template_id args.
+	[TEMPLATE_ID_EXPR]: Break out folding code, call it.
+	(tsubst_copy_and_build) [TEMPLATE_ID_EXPR]: Call
+	maybe_fold_nontype_args.
+
 2003-03-24  Nathan Sidwell  <nathan@codesourcery.com>
 
 	PR c++/10026
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a402ba06193..a5f853a4e28 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2003-03-24  Nathan Sidwell  <nathan@codesourcery.com>
 
+	PR c++/10119
+	* g++.dg/template/ptrmem5.C: New test.
+
 	PR c++/10026
 	* g++.dg/lookup/koenig1.C: New test.
 
diff --git a/gcc/testsuite/g++.dg/template/ptrmem5.C b/gcc/testsuite/g++.dg/template/ptrmem5.C
new file mode 100644
index 00000000000..50a7e77f4b2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/ptrmem5.C
@@ -0,0 +1,25 @@
+// { dg-do compile }
+
+// Copyright (C) 2003 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 24 Mar 2003 <nathan@codesourcery.com>
+
+// PR 10119 (part). We failed to tsubst the args of a template-id-expr
+
+template <class T, void (T::* const U)()> struct Good
+{
+  static int const value = 0;
+};
+
+struct A
+{
+  template <typename U> void good ()
+  {
+    int s_id = Good<A, &A::good<U> >::value;
+  }
+};
+
+
+int main()
+{
+  A().good<int>();
+}