From 6e976965454c79de70cba16d4f51401859eb569c Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Thu, 12 Jan 2006 16:01:15 +0000 Subject: [PATCH] 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 | 7 +++++++ gcc/cp/class.c | 2 +- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/g++.dg/debug/dwarf2-1.C | 22 ++++++++++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/debug/dwarf2-1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 180c926b7ea7..62bb3aab5db5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,12 @@ +2006-01-12 Nathan Sidwell + + PR c++/24824 + * class.c (handle_using_decl): Pass correct scope to + cp_emit_debug_info_for_using. + 2006-01-11 Nathan Sidwell + 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 4509ac23bbb7..86dbcca14e62 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 3032b348cc75..1df57570b208 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-01-12 Nathan Sidwell + + PR c++/24824 + * g++.dg/debug/dwarf2-1.C: New. + 2006-01-11 H.J. Lu PR testsuite/25728 @@ -88,6 +93,7 @@ 2006-01-11 Nathan Sidwell + PR c++/25386 * g++.dg/ext/packed3.C: Add expected packed error. 2006-01-11 Hans-Peter Nilsson 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 000000000000..e90d51030c85 --- /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 + +// 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; -- 2.47.2