re PR debug/24824 (ICE: in build_abbrev_table, at dwarf2out.c:6427 with -feliminate-dwarf2-dups)

	PR c++/24824
	* class.c (handle_using_decl): Pass correct scope to
	cp_emit_debug_info_for_using.

	PR c++/24824
	* g++.dg/debug/dwarf2-1.C: New.

From-SVN: r109643

gcc/cp/ChangeLog

+2006-01-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/24824
+	* class.c (handle_using_decl): Pass correct scope to
+	cp_emit_debug_info_for_using.
+
 2006-01-11  Nathan Sidwell  <nathan@codesourcery.com>
 
+	PR c++/25386
 	* tree.c (lvalue_p_1): Any part of a COMPONENT_REF affects
 	packedness.
 

gcc/cp/class.c

@@ -1159,7 +1159,7 @@ handle_using_decl (tree using_decl, tree t)
 	old_value = NULL_TREE;
     }
 
-  cp_emit_debug_info_for_using (decl, current_class_type);
+  cp_emit_debug_info_for_using (decl, USING_DECL_SCOPE (using_decl));
 
   if (is_overloaded_fn (decl))
     flist = decl;

gcc/testsuite/ChangeLog

+2006-01-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/24824
+	* g++.dg/debug/dwarf2-1.C: New.
+
 2006-01-11  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR testsuite/25728
@@ -88,6 +93,7 @@
 
 2006-01-11  Nathan Sidwell  <nathan@codesourcery.com>
 
+	PR c++/25386
 	* g++.dg/ext/packed3.C: Add expected packed error.
 
 2006-01-11  Hans-Peter Nilsson  <hp@axis.com>

gcc/testsuite/g++.dg/debug/dwarf2-1.C

+// Copyright (C) 2006 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 6 Jan 2006 <nathan@codesourcery.com>
+
+// PR 24824
+// Origin:   	 wanderer@rsu.ru
+
+// { dg-options "-feliminate-dwarf2-dups" }
+
+namespace N
+{
+  struct Base
+  {
+    int m;
+  };
+
+  struct Derived : Base
+  {
+    using Base::m;
+  };
+}
+
+N::Derived thing;