diff options
| author | David Chase <drchase@google.com> | 2021-02-17 10:38:03 -0500 |
|---|---|---|
| committer | David Chase <drchase@google.com> | 2021-03-03 15:00:48 +0000 |
| commit | 9f33dc3ca1b7b6bdb1a8e83c24d490f579bbbdc8 (patch) | |
| tree | 2b3ff2bdfd9e48e78cdd1570c86c2957a093b5b1 /src/cmd/compile/internal/ssa/stackalloc.go | |
| parent | c4e3f6c4c78f52060d409a549b83b72644069137 (diff) | |
| download | go-9f33dc3ca1b7b6bdb1a8e83c24d490f579bbbdc8.tar.xz | |
cmd/compile: handle aggregate OpArg in registers
Also handles case where OpArg does not escape but has its address
taken.
May have exposed a lurking bug in 1.16 expandCalls,
if e.g., loading len(someArrayOfstructThing[0].secondStringField)
from a local. Maybe.
For #40724.
Change-Id: I0298c4ad5d652b5e3d7ed6a62095d59e2d8819c7
Reviewed-on: https://go-review.googlesource.com/c/go/+/293396
Trust: David Chase <drchase@google.com>
Reviewed-by: Cherry Zhang <cherryyz@google.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, 13 insertions, 2 deletions
diff --git a/src/cmd/compile/internal/ssa/stackalloc.go b/src/cmd/compile/internal/ssa/stackalloc.go index 68a6f08a2a..041e7855f6 100644 --- a/src/cmd/compile/internal/ssa/stackalloc.go +++ b/src/cmd/compile/internal/ssa/stackalloc.go @@ -151,13 +151,24 @@ func (s *stackAllocState) stackalloc() { // Allocate args to their assigned locations. for _, v := range f.Entry.Values { - if v.Op != OpArg { + if v.Op != OpArg { // && v.Op != OpArgFReg && v.Op != OpArgIReg { continue } if v.Aux == nil { f.Fatalf("%s has nil Aux\n", v.LongString()) } - loc := LocalSlot{N: v.Aux.(*ir.Name), Type: v.Type, Off: v.AuxInt} + var loc LocalSlot + var name *ir.Name + var offset int64 + if v.Op == OpArg { + name = v.Aux.(*ir.Name) + offset = v.AuxInt + } else { + nameOff := v.Aux.(*AuxNameOffset) + name = nameOff.Name + offset = nameOff.Offset + } + loc = LocalSlot{N: name, Type: v.Type, Off: offset} if f.pass.debug > stackDebug { fmt.Printf("stackalloc %s to %s\n", v, loc) } |
