From 2e93fe0a9f55aaa2a762e7fb454d76b2ee3a4e4f Mon Sep 17 00:00:00 2001 From: David Chase Date: Tue, 25 Apr 2023 19:14:05 -0400 Subject: runtime: move per-type types to internal/abi Change-Id: I1f031f0f83a94bebe41d3978a91a903dc5bcda66 Reviewed-on: https://go-review.googlesource.com/c/go/+/489276 Reviewed-by: Keith Randall Reviewed-by: Keith Randall Run-TryBot: David Chase TryBot-Result: Gopher Robot --- src/cmd/link/internal/ld/dwarf.go | 12 ++++++------ src/cmd/link/internal/ld/dwarf_test.go | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/cmd/link') diff --git a/src/cmd/link/internal/ld/dwarf.go b/src/cmd/link/internal/ld/dwarf.go index 238262cffe..aef46872bb 100644 --- a/src/cmd/link/internal/ld/dwarf.go +++ b/src/cmd/link/internal/ld/dwarf.go @@ -1805,12 +1805,12 @@ func dwarfGenerateDebugInfo(ctxt *Link) { "type:internal/abi.Type", "type:internal/abi.ArrayType", "type:internal/abi.ChanType", - "type:runtime.functype", - "type:runtime.maptype", - "type:runtime.ptrtype", - "type:runtime.slicetype", - "type:runtime.structtype", - "type:runtime.interfacetype", + "type:internal/abi.FuncType", + "type:internal/abi.MapType", + "type:internal/abi.PtrType", + "type:internal/abi.SliceType", + "type:internal/abi.StructType", + "type:internal/abi.InterfaceType", "type:runtime.itab", "type:internal/abi.Imethod"} { d.defgotype(d.lookupOrDiag(typ)) diff --git a/src/cmd/link/internal/ld/dwarf_test.go b/src/cmd/link/internal/ld/dwarf_test.go index 15682dff3d..6ca2a844f5 100644 --- a/src/cmd/link/internal/ld/dwarf_test.go +++ b/src/cmd/link/internal/ld/dwarf_test.go @@ -56,16 +56,16 @@ func TestRuntimeTypesPresent(t *testing.T) { } want := map[string]bool{ - "internal/abi.Type": true, - "internal/abi.ArrayType": true, - "internal/abi.ChanType": true, - "runtime.functype": true, - "runtime.maptype": true, - "runtime.ptrtype": true, - "runtime.slicetype": true, - "runtime.structtype": true, - "runtime.interfacetype": true, - "runtime.itab": true, + "internal/abi.Type": true, + "internal/abi.ArrayType": true, + "internal/abi.ChanType": true, + "internal/abi.FuncType": true, + "internal/abi.MapType": true, + "internal/abi.PtrType": true, + "internal/abi.SliceType": true, + "internal/abi.StructType": true, + "internal/abi.InterfaceType": true, + "runtime.itab": true, } found := findTypes(t, dwarf, want) -- cgit v1.3