diff options
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/compile/internal/reflectdata/map_swiss.go | 1 | ||||
| -rw-r--r-- | src/cmd/link/internal/ld/deadcode.go | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/cmd/compile/internal/reflectdata/map_swiss.go b/src/cmd/compile/internal/reflectdata/map_swiss.go index 98abd69c34..629136821b 100644 --- a/src/cmd/compile/internal/reflectdata/map_swiss.go +++ b/src/cmd/compile/internal/reflectdata/map_swiss.go @@ -276,6 +276,7 @@ func writeSwissMapType(t *types.Type, lsym *obj.LSym, c rttype.Cursor) { c.Field("Elem").WritePtr(s2) c.Field("Group").WritePtr(s3) c.Field("Hasher").WritePtr(hasher) + c.Field("GroupSize").WriteUintptr(uint64(gtyp.Size())) c.Field("SlotSize").WriteUintptr(uint64(slotTyp.Size())) c.Field("ElemOff").WriteUintptr(uint64(elemOff)) var flags uint32 diff --git a/src/cmd/link/internal/ld/deadcode.go b/src/cmd/link/internal/ld/deadcode.go index b9a15767e7..cdf7deb31b 100644 --- a/src/cmd/link/internal/ld/deadcode.go +++ b/src/cmd/link/internal/ld/deadcode.go @@ -561,7 +561,7 @@ func (d *deadcodePass) decodetypeMethods(ldr *loader.Loader, arch *sys.Arch, sym off += 2 * arch.PtrSize case abi.Map: if buildcfg.Experiment.SwissMap { - off += 6*arch.PtrSize + 4 // internal/abi.SwissMapType + off += 7*arch.PtrSize + 4 // internal/abi.SwissMapType if arch.PtrSize == 8 { off += 4 // padding for final uint32 field (Flags). } |