public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/omp/gcc-11] DWARF: fix ICE caused by offload debug fix
@ 2021-05-13 16:19 Kwok Yeung
  0 siblings, 0 replies; only message in thread
From: Kwok Yeung @ 2021-05-13 16:19 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:5c7c1a8ad52aa82ea5e18d4ba6fb03431e65edcf

commit 5c7c1a8ad52aa82ea5e18d4ba6fb03431e65edcf
Author: Andrew Stubbs <ams@codesourcery.com>
Date:   Fri Feb 26 11:40:06 2021 +0000

    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:
---
 gcc/dwarf2out.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 81e1c361b99..5275d380990 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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-05-13 16:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-13 16:19 [gcc/devel/omp/gcc-11] DWARF: fix ICE caused by offload debug fix Kwok Yeung

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).