Revert "cmd/compile: ensure spills of int/float reg args land in abi slots"

This reverts CL 308510.

Reason for revert: It breaks "GOEXPERIMENT=regabi,regabiargs ./make.bash"

Change-Id: I553654690ec73120f8a6258dd80623853c430df0
Reviewed-on: https://go-review.googlesource.com/c/go/+/308932
Trust: David Chase <drchase@google.com>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
This commit is contained in:
David Chase 2021-04-09 14:53:33 +00:00
parent 77b3269fb5
commit 6951da56b0

View file

@ -218,15 +218,8 @@ func (s *stackAllocState) stackalloc() {
// If this is a named value, try to use the name as // If this is a named value, try to use the name as
// the spill location. // the spill location.
var name LocalSlot var name LocalSlot
interfere := false
if v.Op == OpStoreReg { if v.Op == OpStoreReg {
a := v.Args[0] name = names[v.Args[0].ID]
name = names[a.ID]
if name.N == nil && (a.Op == OpArgIntReg || a.Op == OpArgFloatReg) {
// Try harder to spill to the abi-provided spill slot, even if the names are messed up.
nameOff := a.Aux.(*AuxNameOffset)
name = LocalSlot{N: nameOff.Name, Type: v.Type, Off: nameOff.Offset}
}
} else { } else {
name = names[v.ID] name = names[v.ID]
} }
@ -237,7 +230,6 @@ func (s *stackAllocState) stackalloc() {
// A variable can interfere with itself. // A variable can interfere with itself.
// It is rare, but it can happen. // It is rare, but it can happen.
s.nSelfInterfere++ s.nSelfInterfere++
interfere = true
goto noname goto noname
} }
} }
@ -279,11 +271,7 @@ func (s *stackAllocState) stackalloc() {
// Use the stack variable at that index for v. // Use the stack variable at that index for v.
loc := locs[i] loc := locs[i]
if f.pass.debug > stackDebug { if f.pass.debug > stackDebug {
reason := "noname" fmt.Printf("stackalloc %s to %s\n", v, loc)
if interfere {
reason = "interfere"
}
fmt.Printf("stackalloc (%s) %s to %s\n", reason, v, loc)
} }
f.setHome(v, loc) f.setHome(v, loc)
slots[v.ID] = i slots[v.ID] = i