From b69894a343ed513624e65e32f2d0401c4925c851 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Tue, 10 May 2005 00:01:46 +0000 Subject: [PATCH] re PR c/16676 (ICE with nested functions and -g1, blocks glibc) PR debug/16676 * dwarf2out.c (dwarf2out_decl): Always set context_die to NULL, even when debug_info_level is DINFO_LEVEL_TERSE. [testsuite] * gcc.dg/debug/pr16676.c: New test. From-SVN: r99480 --- gcc/ChangeLog | 6 ++++++ gcc/dwarf2out.c | 6 ++---- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/debug/pr16676.c | 5 +++++ 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/debug/pr16676.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b75e41f7d22d..4e711521d14f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-05-10 Ben Elliston + + PR debug/16676 + * dwarf2out.c (dwarf2out_decl): Always set context_die to NULL, + even when debug_info_level is DINFO_LEVEL_TERSE. + 2005-05-08 Stephane Carrez * config/m68hc11/m68hc11.c (m68hc11_z_replacement): Use emit_insn_after diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index d59cc1d3ab57..7fae71bbd350 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -12377,10 +12377,8 @@ dwarf2out_decl (tree decl) /* If we're a nested function, initially use a parent of NULL; if we're a plain function, this will be fixed up in decls_for_scope. If we're a method, it will be ignored, since we already have a DIE. */ - if (decl_function_context (decl) - /* But if we're in terse mode, we don't care about scope. */ - && debug_info_level > DINFO_LEVEL_TERSE) - context_die = NULL; + if (decl_function_context (decl)) + context_die = NULL; break; case VAR_DECL: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1ee2e6f36387..a92b89c08349 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-05-10 Ben Elliston + + PR debug/16676 + * gcc.dg/debug/pr16676.c: New test. + 2005-05-08 Nathan Sidwell PR c++/21427 diff --git a/gcc/testsuite/gcc.dg/debug/pr16676.c b/gcc/testsuite/gcc.dg/debug/pr16676.c new file mode 100644 index 000000000000..a9758858fd38 --- /dev/null +++ b/gcc/testsuite/gcc.dg/debug/pr16676.c @@ -0,0 +1,5 @@ +/* { dg-do compile } */ + +void foo (void) { + void nested () {} +} -- 2.47.2