From: Andrew Stubbs <ams@codesourcery.com>
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=5c7c1a8ad52aa82ea5e18d4ba6fb03431e65edcf;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.c (gen_subprogram_die): Replace existing low/high PC
	attributes, rather than ICE.
---

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 81e1c361b993..5275d380990b 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -23417,9 +23417,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