From 0eb971bd259728516731359bf8a4ac39512a0c30 Mon Sep 17 00:00:00 2001 From: James E Wilson Date: Sat, 19 Mar 2005 03:06:51 +0000 Subject: [PATCH] Fix problem that caused compiled java code to trigger an internal gdb error. PR c++/19769 * dwarf2out.c (declare_in_namespace): Ignore decls with an abstract origin. From-SVN: r96715 --- gcc/ChangeLog | 6 ++++++ gcc/dwarf2out.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d0882f39e29..8033f04b1c1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-03-18 James E Wilson + + PR c++/19769 + * dwarf2out.c (declare_in_namespace): Ignore decls with an abstract + origin. + 2005-03-18 Kazu Hirata * config/mn10300/mn10300-protos.h: Remove the prototypes for diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 5157ae358bc..cc3c9f47a5b 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -12557,6 +12557,12 @@ declare_in_namespace (tree thing, dw_die_ref context_die) if (debug_info_level <= DINFO_LEVEL_TERSE) return; + /* If this decl is from an inlined function, then don't try to emit it in its + namespace, as we will get confused. It would have already been emitted + when the abstract instance of the inline function was emitted anyways. */ + if (DECL_P (thing) && DECL_ABSTRACT_ORIGIN (thing)) + return; + ns_context = setup_namespace_context (thing, context_die); if (ns_context != context_die) -- 2.30.2