diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/dwarf2out.c | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0084d74..4d57808 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2015-06-06 Aldy Hernandez <aldyh@redhat.com> + + * dwarf2out.c (gen_lexical_block_die): Initialize stmt_die. + 2015-06-06 Richard Sandiford <richard.sandiford@arm.com> * emit-rtl.c, expr.c, gcse.c, optabs.c, optabs.h, print-rtl.c, diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 2e3bee3..23cf120 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -19818,7 +19818,7 @@ static void gen_lexical_block_die (tree stmt, dw_die_ref context_die) { dw_die_ref old_die = BLOCK_DIE (stmt); - dw_die_ref stmt_die; + dw_die_ref stmt_die = NULL; if (!old_die) { stmt_die = new_die (DW_TAG_lexical_block, context_die, stmt); @@ -19859,13 +19859,13 @@ gen_lexical_block_die (tree stmt, dw_die_ref context_die) if (old_die) stmt_die = old_die; - if (!early_dwarf) + /* A non abstract block whose blocks have already been reordered + should have the instruction range for this block. If so, set the + high/low attributes. */ + if (!early_dwarf && !BLOCK_ABSTRACT (stmt) && TREE_ASM_WRITTEN (stmt)) { - /* A non abstract block whose blocks have already been reordered - should have the instruction range for this block. If so, set the - high/low attributes. */ - if (! BLOCK_ABSTRACT (stmt) && TREE_ASM_WRITTEN (stmt)) - add_high_low_attributes (stmt, stmt_die); + gcc_assert (stmt_die); + add_high_low_attributes (stmt, stmt_die); } decls_for_scope (stmt, stmt_die); |