From: Andrew Stubbs Date: Fri, 26 Feb 2021 11:40:06 +0000 (+0000) Subject: DWARF: fix ICE caused by offload debug fix X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87af8c58d3141bc62180770060f98a2a3583bb48;p=thirdparty%2Fgcc.git DWARF: fix ICE caused by offload debug fix This should be squashed with 808bdf1bb29 and fdcb23540a2 to go to mainline. gcc/ * dwarf2out.cc (gen_subprogram_die): Replace existing low/high PC attributes, rather than ICE. --- diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp index b246293f9f1c..1052b364689b 100644 --- a/gcc/ChangeLog.omp +++ b/gcc/ChangeLog.omp @@ -1,3 +1,8 @@ +2021-02-26 Andrew Stubbs + + * dwarf2out.cc (gen_subprogram_die): Replace existing low/high PC + attributes, rather than ICE. + 2021-02-02 Chung-Lin Tang * omp-offload.cc (omp_finish_file): Add code to create OpenMP requires diff --git a/gcc/dwarf2out.cc b/gcc/dwarf2out.cc index 46e22c7eb91c..f66b25b764d6 100644 --- a/gcc/dwarf2out.cc +++ b/gcc/dwarf2out.cc @@ -23761,9 +23761,21 @@ gen_subprogram_die (tree decl, dw_die_ref context_die) dw_fde_ref fde = fun->fde; if (fde->dw_fde_begin) { - /* We have already generated the labels. */ - add_AT_low_high_pc (subr_die, fde->dw_fde_begin, - fde->dw_fde_end, false); + dw_attr_node *low = get_AT (subr_die, DW_AT_low_pc); + dw_attr_node *high = get_AT (subr_die, DW_AT_high_pc); + if (low && high) + { + /* Replace the existing value, it will have come from + the "omp target entrypoint" case below. */ + free (low->dw_attr_val.v.val_lbl_id); + low->dw_attr_val.v.val_lbl_id = xstrdup (fde->dw_fde_begin); + free (high->dw_attr_val.v.val_lbl_id); + high->dw_attr_val.v.val_lbl_id = xstrdup (fde->dw_fde_end); + } + else + /* We have already generated the labels. */ + add_AT_low_high_pc (subr_die, fde->dw_fde_begin, + fde->dw_fde_end, false); /* Offload kernel functions are nested within a parent function that doesn't actually exist within the offload object. GDB