re PR c++/13635 (ICE in register_specialization for specific order of template specialization)

	PR c++/13635
	* pt.c (tsubst): Use finish_typeof.

	PR c++/13635
	* g++.dg/ext/typeof7.C: New test.

From-SVN: r76131

gcc/cp/ChangeLog

+2004-01-18  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/13635
+	* pt.c (tsubst): Use finish_typeof.
+
 2004-01-16  Jason Merrill  <jason@redhat.com>
 
 	PR c++/11725

gcc/cp/pt.c

@@ -7106,13 +7106,13 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl)
 
     case TYPEOF_TYPE:
       {
-	tree e1 = tsubst_expr (TYPE_FIELDS (t), args, complain, in_decl);
-	if (e1 == error_mark_node)
-	  return error_mark_node;
+	tree type;
 
-	return cp_build_qualified_type_real (TREE_TYPE (e1),
+	type = finish_typeof (tsubst_expr (TYPE_FIELDS (t), args, complain, 
+					   in_decl));
+	return cp_build_qualified_type_real (type,
 					     cp_type_quals (t)
-					     | cp_type_quals (TREE_TYPE (e1)),
+					     | cp_type_quals (type),
 					     complain);
       }
 

gcc/testsuite/ChangeLog

+2004-01-18  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/13635
+	* g++.dg/ext/typeof7.C: New test.
+
 2004-01-18  David Edelsohn  <edelsohn@gnu.org>
 
 	* gcc.dg/array-quals-1.c: xfail on powerpc*-*-aix*.

gcc/testsuite/g++.dg/ext/typeof7.C

+// PR c++/13635
+// { dg-options "" }
+
+template<int n> class X {template<class Y> typeof(Y::y) foo();};
+X<0> x;
+