aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@codesourcery.com>2006-01-12 16:01:15 +0000
committerNathan Sidwell <nathan@gcc.gnu.org>2006-01-12 16:01:15 +0000
commit6e976965454c79de70cba16d4f51401859eb569c (patch)
treef1b8e70e70147e638cff0c1a9a617ab2d45308fe
parentb5e25bec498caf0710c2488dae6af53182f4c234 (diff)
downloadgcc-6e976965454c79de70cba16d4f51401859eb569c.zip
gcc-6e976965454c79de70cba16d4f51401859eb569c.tar.gz
gcc-6e976965454c79de70cba16d4f51401859eb569c.tar.bz2
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
-rw-r--r--gcc/cp/ChangeLog7
-rw-r--r--gcc/cp/class.c2
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/g++.dg/debug/dwarf2-1.C22
4 files changed, 36 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 180c926..62bb3aa 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,12 @@
+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.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 4509ac2..86dbcca 100644
--- a/gcc/cp/class.c
+++ b/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;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3032b34..1df5757 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+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>
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2-1.C b/gcc/testsuite/g++.dg/debug/dwarf2-1.C
new file mode 100644
index 0000000..e90d510
--- /dev/null
+++ b/gcc/testsuite/g++.dg/debug/dwarf2-1.C
@@ -0,0 +1,22 @@
+// 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;