Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[dev.regabi] cmd/compile: rename addinit(n, init) to initExpr(init, n)

Browse source 
Recreated manually to push below some CLs it depended on.

Change-Id: I1b3316fcdce39cbb33e5cbb471f5cd1cd2efc1f5
Reviewed-on: https://go-review.googlesource.com/c/go/+/274599
Trust: Russ Cox <rsc@golang.org>
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
This commit is contained in:
Russ Cox 2020-12-02 17:03:18 -05:00
parent 6e30fc10fc
commit 7e81135be7
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd/compile/internal/gc/inl.go
View file

@ -537,7 +537,7 @@ func inlconv2stmt(inlcall ir.Node) ir.Node {
// n.Left = inlconv2expr(n.Left) // n.Left = inlconv2expr(n.Left)
func inlconv2expr(n ir.Node) ir.Node { func inlconv2expr(n ir.Node) ir.Node {
r := n.Rlist().First() r := n.Rlist().First()
return addinit(r, append(n.Init().Slice(), n.Body().Slice()...)) return initExpr(append(n.Init().Slice(), n.Body().Slice()...), r)
} }
// Turn the rlist (with the return values) of the OINLCALL in // Turn the rlist (with the return values) of the OINLCALL in
@ -551,7 +551,7 @@ func inlconv2list(n ir.Node) []ir.Node {
} }
s := n.Rlist().Slice() s := n.Rlist().Slice()
s[0] = addinit(s[0], append(n.Init().Slice(), n.Body().Slice()...)) s[0] = initExpr(append(n.Init().Slice(), n.Body().Slice()...), s[0])
return s return s
} }

2
src/cmd/compile/internal/gc/order.go
View file

@ -433,7 +433,7 @@ func (o *Order) exprInPlace(n ir.Node) ir.Node {
var order Order var order Order
order.free = o.free order.free = o.free
n = order.expr(n, nil) n = order.expr(n, nil)
n = addinit(n, order.out) n = initExpr(order.out, n)
// insert new temporaries from order // insert new temporaries from order
// at head of outer list. // at head of outer list.

6
src/cmd/compile/internal/gc/subr.go
View file

@ -1355,9 +1355,9 @@ func ngotype(n ir.Node) *types.Sym {
return nil return nil
} }
// The result of addinit MUST be assigned back to n, e.g. // The result of initExpr MUST be assigned back to n, e.g.
// n.Left = addinit(n.Left, init) // n.Left = initExpr(init, n.Left)
func addinit(n ir.Node, init []ir.Node) ir.Node { func initExpr(init []ir.Node, n ir.Node) ir.Node {
if len(init) == 0 { if len(init) == 0 {
return n return n
} }

4
src/cmd/compile/internal/gc/typecheck.go
View file

@ -1314,7 +1314,7 @@ func typecheck1(n ir.Node, top int) (res ir.Node) {
} }
old := n old := n
n = ir.NodAt(n.Pos(), l.SubOp(), arg, nil) n = ir.NodAt(n.Pos(), l.SubOp(), arg, nil)
n = addinit(n, old.Init().Slice()) // typecheckargs can add to old.Init n = initExpr(old.Init().Slice(), n) // typecheckargs can add to old.Init
case ir.OCOMPLEX, ir.OCOPY: case ir.OCOMPLEX, ir.OCOPY:
typecheckargs(n) typecheckargs(n)
@ -1325,7 +1325,7 @@ func typecheck1(n ir.Node, top int) (res ir.Node) {
} }
old := n old := n
n = ir.NodAt(n.Pos(), l.SubOp(), arg1, arg2) n = ir.NodAt(n.Pos(), l.SubOp(), arg1, arg2)
n = addinit(n, old.Init().Slice()) // typecheckargs can add to old.Init n = initExpr(old.Init().Slice(), n) // typecheckargs can add to old.Init
} }
n = typecheck1(n, top) n = typecheck1(n, top)
return n return n

6
src/cmd/compile/internal/gc/walk.go
View file

@ -180,7 +180,7 @@ func walkstmt(n ir.Node) ir.Node {
n = mkcall1(chanfn("chanrecv1", 2, n.Left().Type()), nil, &init, n.Left(), nodnil()) n = mkcall1(chanfn("chanrecv1", 2, n.Left().Type()), nil, &init, n.Left(), nodnil())
n = walkexpr(n, &init) n = walkexpr(n, &init)
n = addinit(n, init.Slice()) n = initExpr(init.Slice(), n)
case ir.OBREAK, case ir.OBREAK,
ir.OCONTINUE, ir.OCONTINUE,
@ -268,7 +268,7 @@ func walkstmt(n ir.Node) ir.Node {
init := n.Left().Init() init := n.Left().Init()
n.Left().PtrInit().Set(nil) n.Left().PtrInit().Set(nil)
n.SetLeft(walkexpr(n.Left(), &init)) n.SetLeft(walkexpr(n.Left(), &init))
n.SetLeft(addinit(n.Left(), init.Slice())) n.SetLeft(initExpr(init.Slice(), n.Left()))
} }
n.SetRight(walkstmt(n.Right())) n.SetRight(walkstmt(n.Right()))
@ -557,7 +557,7 @@ opswitch:
var ll ir.Nodes var ll ir.Nodes
n.SetRight(walkexpr(n.Right(), &ll)) n.SetRight(walkexpr(n.Right(), &ll))
n.SetRight(addinit(n.Right(), ll.Slice())) n.SetRight(initExpr(ll.Slice(), n.Right()))
case ir.OPRINT, ir.OPRINTN: case ir.OPRINT, ir.OPRINTN:
n = walkprint(n, init) n = walkprint(n, init)