aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2003-09-11 13:41:56 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2003-09-11 13:41:56 +0000
commit9bdca184d65ece8fb958b736d092e65a72f114d0 (patch)
tree2d7032427ea9d4d5a68342d331cd26a21f04cb38 /gcc
parentaa16693981db4d4ef9e8420c639ade115c76b973 (diff)
downloadgcc-9bdca184d65ece8fb958b736d092e65a72f114d0.zip
gcc-9bdca184d65ece8fb958b736d092e65a72f114d0.tar.gz
gcc-9bdca184d65ece8fb958b736d092e65a72f114d0.tar.bz2
re PR fortran/11522 (g77 dwarf-2 ICE in add_abstract_origin_attribute)
PR fortran/11522 * dwarf2out.c (gen_inlined_subroutine_die): Emit abstract function for ultimate origin even if block is abstract. From-SVN: r71301
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/dwarf2out.c12
2 files changed, 14 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index be4c46b..0c7f82b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-11 Alexandre Oliva <aoliva@redhat.com>
+
+ PR fortran/11522
+ * dwarf2out.c (gen_inlined_subroutine_die): Emit abstract function
+ for ultimate origin even if block is abstract.
+
2003-09-11 Roger Sayle <roger@eyesopen.com>
* combine.c (combine_simplify_rtx): Move several NOT and NEG
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index eac43ac..5fa730e 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -10990,16 +10990,20 @@ gen_lexical_block_die (tree stmt, dw_die_ref context_die, int depth)
static void
gen_inlined_subroutine_die (tree stmt, dw_die_ref context_die, int depth)
{
+ tree decl = block_ultimate_origin (stmt);
+
+ /* Emit info for the abstract instance first, if we haven't yet. We
+ must emit this even if the block is abstract, otherwise when we
+ emit the block below (or elsewhere), we may end up trying to emit
+ a die whose origin die hasn't been emitted, and crashing. */
+ dwarf2out_abstract_function (decl);
+
if (! BLOCK_ABSTRACT (stmt))
{
dw_die_ref subr_die
= new_die (DW_TAG_inlined_subroutine, context_die, stmt);
- tree decl = block_ultimate_origin (stmt);
char label[MAX_ARTIFICIAL_LABEL_BYTES];
- /* Emit info for the abstract instance first, if we haven't yet. */
- dwarf2out_abstract_function (decl);
-
add_abstract_origin_attribute (subr_die, decl);
ASM_GENERATE_INTERNAL_LABEL (label, BLOCK_BEGIN_LABEL,
BLOCK_NUMBER (stmt));