From ae33b66c19a2a2cf3b95e67d4cec81b474cf733d Mon Sep 17 00:00:00 2001 From: Than McIntosh Date: Thu, 27 Jun 2024 14:54:06 +0000 Subject: cmd/link: add variable_parameter attr to functype outparams When generating DW_TAG_subroutine_type DIEs during linker DWARF type synthesis, ensure that in the list of children of the subroutine type DIE (correspondings to input/output params) the output params are marked with the DW_AT_variable_parameter attribute. In addition, fix up the generated types of the output params: prior to this patch for a given output parameter of type T, we would emit the DIE type as *T (presumably due to how parameter passing/returning worked prior to the register ABI); with this patch the emitted type will just be T, not *T. Fixes #59977. Change-Id: I5b5600be86473695663c75b85baeecad667b9245 Reviewed-on: https://go-review.googlesource.com/c/go/+/595715 LUCI-TryBot-Result: Go LUCI Reviewed-by: David Chase Reviewed-by: Cherry Mui --- src/cmd/internal/dwarf/dwarf.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'src/cmd/internal/dwarf') diff --git a/src/cmd/internal/dwarf/dwarf.go b/src/cmd/internal/dwarf/dwarf.go index 40ec8a6ec2..6d4e78fb26 100644 --- a/src/cmd/internal/dwarf/dwarf.go +++ b/src/cmd/internal/dwarf/dwarf.go @@ -338,6 +338,7 @@ const ( DW_ABRV_LEXICAL_BLOCK_SIMPLE DW_ABRV_STRUCTFIELD DW_ABRV_FUNCTYPEPARAM + DW_ABRV_FUNCTYPEOUTPARAM DW_ABRV_DOTDOTDOT DW_ABRV_ARRAYRANGE DW_ABRV_NULLTYPE @@ -572,6 +573,8 @@ var abbrevs = []dwAbbrev{ { DW_TAG_member, DW_CHILDREN_no, + // This abbrev is special-cased by the linker (unlike other DIEs + // we don't want a loader.Sym created for this DIE). []dwAttrForm{ {DW_AT_name, DW_FORM_string}, {DW_AT_data_member_location, DW_FORM_udata}, @@ -586,15 +589,34 @@ var abbrevs = []dwAbbrev{ DW_CHILDREN_no, // No name! + // This abbrev is special-cased by the linker (unlike other DIEs + // we don't want a loader.Sym created for this DIE). []dwAttrForm{ {DW_AT_type, DW_FORM_ref_addr}, }, }, + /* FUNCTYPEOUTPARAM */ + { + DW_TAG_formal_parameter, + DW_CHILDREN_no, + + // No name! + // This abbrev is special-cased by the linker (unlike other DIEs + // we don't want a loader.Sym created for this DIE). + []dwAttrForm{ + {DW_AT_variable_parameter, DW_FORM_flag}, + {DW_AT_type, DW_FORM_ref_addr}, + }, + }, + /* DOTDOTDOT */ { DW_TAG_unspecified_parameters, DW_CHILDREN_no, + // No name. + // This abbrev is special-cased by the linker (unlike other DIEs + // we don't want a loader.Sym created for this DIE). []dwAttrForm{}, }, @@ -604,6 +626,8 @@ var abbrevs = []dwAbbrev{ DW_CHILDREN_no, // No name! + // This abbrev is special-cased by the linker (unlike other DIEs + // we don't want a loader.Sym created for this DIE). []dwAttrForm{ {DW_AT_type, DW_FORM_ref_addr}, {DW_AT_count, DW_FORM_udata}, -- cgit v1.3