From 4ece5af359f35eaf4fd7434ca3b9570b9b63bea4 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 28 Jun 2018 10:18:27 +0000 Subject: [PATCH] dwarf2out.c (gen_subprogram_die): Use is_unit_die when deciding whether to not re-use a DIE. 2018-06-28 Richard Biener * dwarf2out.c (gen_subprogram_die): Use is_unit_die when deciding whether to not re-use a DIE. From-SVN: r262217 --- gcc/ChangeLog | 5 +++++ gcc/dwarf2out.c | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e5567914e8f..c9f7236b837 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2018-06-28 Richard Biener + + * dwarf2out.c (gen_subprogram_die): Use is_unit_die when + deciding whether to not re-use a DIE. + 2018-06-28 Richard Biener * dwarf2out.c (gen_subprogram_die): Always re-use DIEs with an diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index bcd47c8363b..db9f6397cc1 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -22780,7 +22780,7 @@ gen_subprogram_die (tree decl, dw_die_ref context_die) apply; we just use the old DIE. */ expanded_location s = expand_location (DECL_SOURCE_LOCATION (decl)); struct dwarf_file_data * file_index = lookup_filename (s.file); - if (((is_cu_die (old_die->die_parent) + if (((is_unit_die (old_die->die_parent) /* This condition fixes the inconsistency/ICE with the following Fortran test (or some derivative thereof) while building libgfortran: @@ -22796,9 +22796,6 @@ gen_subprogram_die (tree decl, dw_die_ref context_die) && old_die->die_parent->die_tag == DW_TAG_module) || context_die == NULL) && (DECL_ARTIFICIAL (decl) - /* The location attributes may be in the abstract origin - which in the case of LTO might be not available to - look at. */ || (get_AT_file (old_die, DW_AT_decl_file) == file_index && (get_AT_unsigned (old_die, DW_AT_decl_line) == (unsigned) s.line) -- 2.30.2