Skip to content

Commit

Permalink
cmd/compile: revert CL/316890
Browse files Browse the repository at this point in the history
This is a revert of https://go-review.googlesource.com/c/go/+/316890,
which has positive effects on debugging + DWARF variable locations
for register parameters when the reg abi is in effect, but also
turns out to interact badly with the register allocator.

Fixes #46304.

Change-Id: I624bd980493411a9cde45d44fcd3c46cad796909
Reviewed-on: https://go-review.googlesource.com/c/go/+/321830
Trust: Than McIntosh <[email protected]>
Run-TryBot: Than McIntosh <[email protected]>
Reviewed-by: Cherry Mui <[email protected]>
TryBot-Result: Go Bot <[email protected]>
  • Loading branch information
thanm committed May 22, 2021
1 parent f87194c commit cca23a7
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 16 deletions.
16 changes: 0 additions & 16 deletions src/cmd/compile/internal/ssa/expand_calls.go
Original file line number Diff line number Diff line change
Expand Up @@ -1717,22 +1717,6 @@ func (x *expandState) newArgToMemOrRegs(baseArg, toReplace *Value, offset int64,
} else {
w = baseArg.Block.NewValue0IA(pos, op, t, auxInt, aux)
}
// If we are creating an OpArgIntReg/OpArgFloatReg that
// corresponds to an in-param that fits entirely in a register,
// then enter it into the name/value table. The LocalSlot
// is somewhat fictitious, since there is no incoming live
// memory version of the parameter, but we need an entry in
// NamedValues in order for ssa debug tracking to include
// the value in the tracking analysis.
if len(pa.Registers) == 1 {
loc := LocalSlot{N: aux.Name, Type: t, Off: 0}
values, ok := x.f.NamedValues[loc]
if !ok {
ploc := x.f.localSlotAddr(loc)
x.f.Names = append(x.f.Names, ploc)
}
x.f.NamedValues[loc] = append(values, w)
}
x.commonArgs[key] = w
if toReplace != nil {
toReplace.copyOf(w)
Expand Down
76 changes: 76 additions & 0 deletions test/fixedbugs/issue46304.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
// run

// Copyright 2021 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// This testcase caused a crash when the register ABI was in effect,
// on amd64 (problem with register allocation).

package main

type Op struct {
tag string
_x []string
_q [20]uint64
plist []P
}

type P struct {
tag string
_x [10]uint64
b bool
}

type M int

//go:noinline
func (w *M) walkP(p *P) *P {
np := &P{}
*np = *p
np.tag += "new"
return np
}

func (w *M) walkOp(op *Op) *Op {
if op == nil {
return nil
}

orig := op
cloned := false
clone := func() {
if !cloned {
cloned = true
op = &Op{}
*op = *orig
}
}

pCloned := false
for i := range op.plist {
if s := w.walkP(&op.plist[i]); s != &op.plist[i] {
if !pCloned {
pCloned = true
clone()
op.plist = make([]P, len(orig.plist))
copy(op.plist, orig.plist)
}
op.plist[i] = *s
}
}

return op
}

func main() {
var ww M
w := &ww
p1 := P{tag: "a"}
p1._x[1] = 9
o := Op{tag: "old", plist: []P{p1}}
no := w.walkOp(&o)
if no.plist[0].tag != "anew" {
panic("bad")
}
}

0 comments on commit cca23a7

Please sign in to comment.