re PR c++/24569 (ICE in add_AT_specification, at dwarf2out.c:4966)

	PR c++/24569
	* pt.c (instantiate_decl): Use cp_finish_decl, not
	finish_static_data_member_decl. 
	PR c++/24569
	* g++.dg/debug/static1.C: New test.

From-SVN: r106392

gcc/cp/ChangeLog

+2005-11-02  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/24569
+	* pt.c (instantiate_decl): Use cp_finish_decl, not
+	finish_static_data_member_decl. 
+
 2005-10-28  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	* decl.c (grokfndecl): Remove the setting

gcc/cp/pt.c

@@ -11630,10 +11630,9 @@ instantiate_decl (tree d, int defer_ok,
 	  init = tsubst_expr (DECL_INITIAL (code_pattern), 
 			      args,
 			      tf_error | tf_warning, NULL_TREE);
-	  DECL_INITIAL (d) = NULL_TREE;
-	  finish_static_data_member_decl (d, init, 
-					  /*asmspec_tree=*/NULL_TREE,
-					  LOOKUP_ONLYCONVERTING);
+	  DECL_INITIAL (d) = init;
+	  cp_finish_decl (d, init, /*asmspec_tree=*/NULL_TREE,
+			  LOOKUP_ONLYCONVERTING);
 	  pop_nested_class ();
 	  pop_nested_namespace (ns);
 	}

gcc/testsuite/ChangeLog

+2005-11-02  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/24569
+	* g++.dg/debug/static1.C: New test.
+
 2005-11-02  Josh Conner  <jconner@apple.com>
 
 	* g++.dg/crash38.C: moved into proper directory...

gcc/testsuite/g++.dg/debug/static1.C

+// PR c++/24569
+
+template <int dim>
+struct S
+{
+  static const int u = 2 * dim;
+  static const int p[u];
+  static int f();
+};
+
+template <>
+inline int S<3>::f () { return 1; }
+
+template <int dim> const int S<dim>::u;
+
+template class S<3>;