From e6a83a8e9e211f45d862a81d22deb2aed8e66453 Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Fri, 28 Aug 2009 13:32:29 -0700 Subject: [PATCH] re PR debug/41063 (ICE in output_die) gcc/ChangeLog: PR debug/41063 * dwarf2out.c (gen_type_die_with_usage): Use proper context for struct/union/enum types local to a function. gcc/testsuite/ChangeLog: PR debug/41063 * g++.dg/debug/dwarf2/pr41063.C: New test. From-SVN: r151185 --- gcc/dwarf2out.c | 9 +++++++++ gcc/testsuite/g++.dg/debug/dwarf2/pr41063.C | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 gcc/testsuite/g++.dg/debug/dwarf2/pr41063.C diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 04f875870c32..aad6ee7716a5 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -15573,6 +15573,15 @@ gen_type_die_with_usage (tree type, dw_die_ref context_die, context_die = lookup_type_die (TYPE_CONTEXT (type)); need_pop = 1; } + else if (TYPE_CONTEXT (type) != NULL_TREE + && (TREE_CODE (TYPE_CONTEXT (type)) == FUNCTION_DECL)) + { + /* If this type is local to a function that hasn't been written + out yet, use a NULL context for now; it will be fixed up in + decls_for_scope. */ + context_die = lookup_decl_die (TYPE_CONTEXT (type)); + need_pop = 0; + } else { context_die = declare_in_namespace (type, context_die); diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/pr41063.C b/gcc/testsuite/g++.dg/debug/dwarf2/pr41063.C new file mode 100644 index 000000000000..f23efef13d21 --- /dev/null +++ b/gcc/testsuite/g++.dg/debug/dwarf2/pr41063.C @@ -0,0 +1,20 @@ +// Contributed by Cary Coutant +// Origin: PR debug/41063 +// { dg-do compile } + +struct A { + virtual void run(); +}; + +void test() { + struct B : public A { + void run() { + struct C : public A { + C() { } + B *b_; + }; + C c; + } + }; + B b; +} -- 2.47.2