cmd/compile: change get{this,inarg,outarg}x? into methods
More idiomatic naming (in particular, matches the naming used for
go/types.Signature).
Also, convert more code to use these methods and/or IterFields.
(Still more to go; only made a quick pass for low hanging fruit.)
Passes toolstash -cmp.
Change-Id: I61831bfb1ec2cd50d4c7efc6062bca4e0dcf267b
Reviewed-on: https://go-review.googlesource.com/20451
Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/src/cmd/compile/internal/gc/walk.go b/src/cmd/compile/internal/gc/walk.go
index 56de81f..1db951c 100644
--- a/src/cmd/compile/internal/gc/walk.go
+++ b/src/cmd/compile/internal/gc/walk.go
@@ -328,7 +328,7 @@
break
}
- ll := ascompatte(n.Op, nil, false, Getoutarg(Curfn.Type), n.List.Slice(), 1, &n.Ninit)
+ ll := ascompatte(n.Op, nil, false, Curfn.Type.ResultsP(), n.List.Slice(), 1, &n.Ninit)
setNodeSeq(&n.List, ll)
case ORETJMP:
@@ -638,7 +638,7 @@
}
walkexpr(&n.Left, init)
walkexprlist(n.List.Slice(), init)
- ll := ascompatte(n.Op, n, n.Isddd, getinarg(t), n.List.Slice(), 0, init)
+ ll := ascompatte(n.Op, n, n.Isddd, t.ParamsP(), n.List.Slice(), 0, init)
setNodeSeq(&n.List, reorder1(ll))
case OCALLFUNC:
@@ -657,13 +657,13 @@
// Update type of OCALLFUNC node.
// Output arguments had not changed, but their offsets could.
if n.Left.Type.Outtuple == 1 {
- t := getoutargx(n.Left.Type).Type
+ t := n.Left.Type.Results().Type
if t.Etype == TFIELD {
t = t.Type
}
n.Type = t
} else {
- n.Type = getoutargx(n.Left.Type)
+ n.Type = n.Left.Type.Results()
}
}
@@ -685,7 +685,7 @@
}
}
- ll := ascompatte(n.Op, n, n.Isddd, getinarg(t), n.List.Slice(), 0, init)
+ ll := ascompatte(n.Op, n, n.Isddd, t.ParamsP(), n.List.Slice(), 0, init)
setNodeSeq(&n.List, reorder1(ll))
case OCALLMETH:
@@ -695,8 +695,8 @@
}
walkexpr(&n.Left, init)
walkexprlist(n.List.Slice(), init)
- ll := ascompatte(n.Op, n, false, getthis(t), []*Node{n.Left.Left}, 0, init)
- lr := ascompatte(n.Op, n, n.Isddd, getinarg(t), n.List.Slice(), 0, init)
+ ll := ascompatte(n.Op, n, false, t.RecvP(), []*Node{n.Left.Left}, 0, init)
+ lr := ascompatte(n.Op, n, n.Isddd, t.ParamsP(), n.List.Slice(), 0, init)
ll = append(ll, lr...)
n.Left.Left = nil
ullmancalc(n.Left)
@@ -870,7 +870,7 @@
a := nodeSeqFirst(n.List)
fn := mapfn(p, t)
- r = mkcall1(fn, getoutargx(fn.Type), init, typename(t), r.Left, key)
+ r = mkcall1(fn, fn.Type.Results(), init, typename(t), r.Left, key)
// mapaccess2* returns a typed bool, but due to spec changes,
// the boolean result of i.(T) is now untyped so we make it the
@@ -2031,7 +2031,7 @@
continue
}
- t = getinargx(on.Type)
+ t = on.Type.Params()
if t != nil {
t = t.Type
}
@@ -2650,12 +2650,12 @@
func heapmoves() {
lno := lineno
lineno = Curfn.Lineno
- nn := paramstoheap(getthis(Curfn.Type), 0)
- nn = append(nn, paramstoheap(getinarg(Curfn.Type), 0)...)
- nn = append(nn, paramstoheap(Getoutarg(Curfn.Type), 1)...)
+ nn := paramstoheap(Curfn.Type.RecvP(), 0)
+ nn = append(nn, paramstoheap(Curfn.Type.ParamsP(), 0)...)
+ nn = append(nn, paramstoheap(Curfn.Type.ResultsP(), 1)...)
Curfn.Func.Enter.Append(nn...)
lineno = Curfn.Func.Endlineno
- Curfn.Func.Exit.Append(returnsfromheap(Getoutarg(Curfn.Type))...)
+ Curfn.Func.Exit.Append(returnsfromheap(Curfn.Type.ResultsP())...)
lineno = lno
}
