diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1999-02-25 21:26:06 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1999-02-25 16:26:06 -0500 |
| commit | 6646d96c23467215ae2284060dbf4719c7adac08 (patch) | |
| tree | 1c837ba3b935e00fed80a7fcb2502bc021a1573f /gcc | |
| parent | ca261cb478a90a849cdb96673439a7c9e5fca50c (diff) | |
| download | gcc-6646d96c23467215ae2284060dbf4719c7adac08.zip gcc-6646d96c23467215ae2284060dbf4719c7adac08.tar.gz gcc-6646d96c23467215ae2284060dbf4719c7adac08.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/dwarf2out.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9a6ef2c..75379f9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 25 21:23:06 1999 Jason Merrill <jason@yorick.cygnus.com> + + * 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 <ghazi@caip.rutgers.edu> * cppexp.c (left_shift, right_shift, parse_charconst, COMPARE, @@ -333,7 +338,6 @@ Fri Feb 19 18:18:56 1999 Don Bowman <don@pixstream.com> * 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 48331b9..2045ff4 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; } } |