From 6646d96c23467215ae2284060dbf4719c7adac08 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 25 Feb 1999 21:26:06 +0000 Subject: [PATCH] dwarf2out.c (scope_die_for): Set scope_die to comp_unit_die rather than asserting it. * dwarf2out.c (scope_die_for): Set scope_die to comp_unit_die rather than asserting it. From-SVN: r25448 --- gcc/ChangeLog | 6 +++++- gcc/dwarf2out.c | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9a6ef2c77c9..75379f96bd0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 25 21:23:06 1999 Jason Merrill + + * dwarf2out.c (scope_die_for): Set scope_die to comp_unit_die + rather than asserting it. + Thu Feb 25 23:33:06 1999 Kaveh R. Ghazi * cppexp.c (left_shift, right_shift, parse_charconst, COMPARE, @@ -333,7 +338,6 @@ Fri Feb 19 18:18:56 1999 Don Bowman * configure.in (mips*-*-vxworks*): Enable gthreads vxworks support. * configure: Rebuilt. ->>>>>>> 1.3049 Sun Feb 21 20:34:44 PST 1999 Jeff Law (law@cygnus.com) * version.c: Bump for snapshot. diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 48331b9e789..2045ff4ce58 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -7682,12 +7682,14 @@ scope_die_for (t, context_die) if (i < 0) { - if (scope_die != comp_unit_die - || TREE_CODE_CLASS (TREE_CODE (containing_scope)) != 't') + if (TREE_CODE_CLASS (TREE_CODE (containing_scope)) != 't') abort (); if (debug_info_level > DINFO_LEVEL_TERSE && !TREE_ASM_WRITTEN (containing_scope)) abort (); + + /* If none of the current dies are suitable, we get file scope. */ + scope_die = comp_unit_die; } } -- 2.30.2