Attachment 12564 Details for Bug 24726 – Support few DWARF-5 DW_AT_*+DW_OP_*

[patch] Support few DWARF-5 DW_AT_*+DW_OP_*

dwz-clang11.patch (text/plain), 2.29 KB, created by Jan Kratochvil on 2020-05-22 21:11:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kratochvil

Created: 2020-05-22 21:11:08 UTC

Size: 2.29 KB

patch

obsolete

>diff --git a/dwz.c b/dwz.c
>index 7ec0623..f9cf9cb 100644
>--- a/dwz.c
>+++ b/dwz.c
>@@ -2023,6 +2023,7 @@ read_exprloc (DSO *dso, dw_die_ref die, unsigned char *ptr, size_t len,
> 	  }
> 	  break;
> 	case DW_OP_GNU_entry_value:
>+	case DW_OP_entry_value:
> 	  {
> 	    uint32_t leni = read_uleb128 (ptr);
> 	    if ((uint64_t) (end - ptr) < leni)
>@@ -2242,6 +2243,7 @@ read_exprloc_low_mem_phase1 (DSO *dso, dw_die_ref die, unsigned char *ptr,
> 	  }
> 	  break;
> 	case DW_OP_GNU_entry_value:
>+	case DW_OP_entry_value:
> 	  {
> 	    uint32_t leni = read_uleb128 (ptr);
> 	    if ((uint64_t) (end - ptr) < leni)
>@@ -2368,6 +2370,8 @@ add_locexpr_dummy_dies (DSO *dso, dw_cu_ref cu, dw_die_ref die,
> 	case DW_AT_GNU_call_site_data_value:
> 	case DW_AT_GNU_call_site_target:
> 	case DW_AT_GNU_call_site_target_clobbered:
>+	case DW_AT_call_value:
>+	case DW_AT_call_target:
> 	  if (read_exprloc_low_mem_phase1 (dso, die, ptr, len))
> 	    return 1;
> 	default:
>@@ -3066,6 +3070,8 @@ checksum_die (DSO *dso, dw_cu_ref cu, dw_die_ref top_die, dw_die_ref die)
> 	    case DW_AT_GNU_call_site_data_value:
> 	    case DW_AT_GNU_call_site_target:
> 	    case DW_AT_GNU_call_site_target_clobbered:
>+	    case DW_AT_call_value:
>+	    case DW_AT_call_target:
> 	      if (die->die_ck_state != CK_BAD)
> 		{
> 		  s = t->attr[i].attr;
>@@ -6199,6 +6205,8 @@ read_debug_info (DSO *dso, int kind, unsigned int *die_count)
> 		    }
> 
> 		  if (t->attr[i].attr > DW_AT_linkage_name
>+		      && t->attr[i].attr != DW_AT_call_value
>+		      && t->attr[i].attr != DW_AT_call_target
> 		      && (t->attr[i].attr < DW_AT_MIPS_fde
> 			  || t->attr[i].attr > DW_AT_MIPS_has_inlines)
> 		      && (t->attr[i].attr < DW_AT_sf_names
>@@ -10962,6 +10970,7 @@ adjust_exprloc (dw_cu_ref cu, dw_die_ref die, dw_cu_ref refcu,
> 	  ptr += leni;
> 	  break;
> 	case DW_OP_GNU_entry_value:
>+	case DW_OP_entry_value:
> 	  leni = read_uleb128 (ptr);
> 	  assert ((uint64_t) (end - ptr) >= leni);
> 	  adjust_exprloc (cu, die, refcu, ref, ptr, leni);
>@@ -11466,6 +11475,8 @@ write_die (unsigned char *ptr, dw_cu_ref cu, dw_die_ref die,
> 	      case DW_AT_GNU_call_site_data_value:
> 	      case DW_AT_GNU_call_site_target:
> 	      case DW_AT_GNU_call_site_target_clobbered:
>+	      case DW_AT_call_value:
>+	      case DW_AT_call_target:
> 		adjust_exprloc (cu, die, refcu, ref, ptr - len, len);
> 	      default:
> 		break;

Actions: View | Diff

Attachments on bug 24726: 12564