re PR c++/3637 (Internal compiler error in finish_member_declaration)

	PR c++/3637
	* pt.c (lookup_template_class): Ensure that all specializations
	are registered on the list corresponding to the most general
	template.

From-SVN: r47252

3 files changed, 48 insertions, 3 deletions

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9d78cbe..9637ab5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,6 +1,12 @@
-2001-11-20  Mark Mitchell  <mark@codesourcery.com>
+2001-11-21  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/3637
+	* pt.c (lookup_template_class): Ensure that all specializations
+	are registered on the list corresponding to the most general
+	template.
+
+2001-11-20  Mark Mitchell  <mark@codesourcery.com>
+
 	* call.c (non_reference): Add documentation.
 	(convert_class_to_reference): Do not strip reference types 
 	from conversion operators.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index f1a41f2..f80392a 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -4211,9 +4211,8 @@ lookup_template_class (d1, arglist, in_decl, context, entering_scope, complain)
                  Create the partial instantiation.
                */
               TREE_VEC_LENGTH (arglist)--;
-              template = tsubst (template, arglist, /*complain=*/0, NULL_TREE);
+              found = tsubst (template, arglist, /*complain=*/0, NULL_TREE);
               TREE_VEC_LENGTH (arglist)++;
-              found = template;
             }
 	}
 
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp100.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp100.C
new file mode 100644
index 0000000..14db8ae
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp100.C
@@ -0,0 +1,40 @@
+// Build don't link:
+// Origin: philippeb@videotron.ca
+// Special g++ Options:
+
+#include <iostream>
+
+using namespace std;
+
+template <class _T> struct traits
+{
+  typedef long next;
+};
+
+
+template <class _T>
+struct c1
+{
+  template <class _U>
+  struct c2
+  {
+    c2()
+    {
+      cout << __PRETTY_FUNCTION__ << endl;
+    }
+  };
+};
+
+
+template <class _T>
+void foo()
+{
+  cout << __PRETTY_FUNCTION__ << endl;
+  c1<typename traits<_T>::next>::c2<void>();
+}
+
+
+int main()
+{
+  foo<int>();
+}