diff options
| author | khr@golang.org <khr@golang.org> | 2024-02-20 10:32:26 -0800 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2024-02-29 21:29:41 +0000 |
| commit | e93041333150e6b74f931119036156938dcd0925 (patch) | |
| tree | 3e323e5e1e2eb61fc11a87d5ab35d584f5197301 /src/cmd/compile/internal/ssa/stackalloc.go | |
| parent | 4e7bd20f8fdccdb2f0f30b051e3ea3fffb449367 (diff) | |
| download | go-e93041333150e6b74f931119036156938dcd0925.tar.xz | |
cmd/compile: soften type matching when allocating stack slots
Currently we use pointer equality on types when deciding whether we can
reuse a stack slot. That's too strict, as we don't guarantee pointer
equality for the same type. In particular, it can vary based on whether
PtrTo has been called in the frontend or not.
Instead, use the type's LinkString, which is guaranteed to both be
unique for a type, and to not vary given two different type structures
describing the same type.
Update #65783
Change-Id: I64f55138475f04bfa30cfb819b786b7cc06aebe4
Reviewed-on: https://go-review.googlesource.com/c/go/+/565436
Reviewed-by: Keith Randall <khr@google.com>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Keith Randall <khr@golang.org>
Reviewed-by: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Diffstat (limited to 'src/cmd/compile/internal/ssa/stackalloc.go')
| -rw-r--r-- | src/cmd/compile/internal/ssa/stackalloc.go | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/cmd/compile/internal/ssa/stackalloc.go b/src/cmd/compile/internal/ssa/stackalloc.go index c9ca778b3a..8290e1730e 100644 --- a/src/cmd/compile/internal/ssa/stackalloc.go +++ b/src/cmd/compile/internal/ssa/stackalloc.go @@ -202,11 +202,11 @@ func (s *stackAllocState) stackalloc() { } // For each type, we keep track of all the stack slots we - // have allocated for that type. - // TODO: share slots among equivalent types. We would need to - // only share among types with the same GC signature. See the - // type.Equal calls below for where this matters. - locations := map[*types.Type][]LocalSlot{} + // have allocated for that type. This map is keyed by + // strings returned by types.LinkString. This guarantees + // type equality, but also lets us match the same type represented + // by two different types.Type structures. See issue 65783. + locations := map[string][]LocalSlot{} // Each time we assign a stack slot to a value v, we remember // the slot we used via an index into locations[v.Type]. @@ -258,7 +258,8 @@ func (s *stackAllocState) stackalloc() { noname: // Set of stack slots we could reuse. - locs := locations[v.Type] + typeKey := v.Type.LinkString() + locs := locations[typeKey] // Mark all positions in locs used by interfering values. for i := 0; i < len(locs); i++ { used[i] = false @@ -281,7 +282,7 @@ func (s *stackAllocState) stackalloc() { if i == len(locs) { s.nAuto++ locs = append(locs, LocalSlot{N: f.NewLocal(v.Pos, v.Type), Type: v.Type, Off: 0}) - locations[v.Type] = locs + locations[typeKey] = locs } // Use the stack variable at that index for v. loc := locs[i] |
