Commit f07059d9 authored by DQNEO's avatar DQNEO Committed by Emmanuel Odeke

cmd/compile: rename sizeof_Array and array_* to slice_*

Renames variables sizeof_Array and other array_* variables
that were actually intended for slices and not arrays.

Change-Id: I391b95880cc77cabb8472efe694b7dd19545f31a
Reviewed-on: https://go-review.googlesource.com/c/go/+/180919Reviewed-by: default avatarEmmanuel Odeke <emm.odeke@gmail.com>
Run-TryBot: Emmanuel Odeke <emm.odeke@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent 47bc2409
...@@ -344,7 +344,7 @@ func dowidth(t *types.Type) { ...@@ -344,7 +344,7 @@ func dowidth(t *types.Type) {
if t.Elem() == nil { if t.Elem() == nil {
break break
} }
w = int64(sizeof_Array) w = int64(sizeof_Slice)
checkwidth(t.Elem()) checkwidth(t.Elem())
t.Align = uint8(Widthptr) t.Align = uint8(Widthptr)
......
...@@ -65,21 +65,21 @@ const ( ...@@ -65,21 +65,21 @@ const (
) )
// note this is the runtime representation // note this is the runtime representation
// of the compilers arrays. // of the compilers slices.
// //
// typedef struct // typedef struct
// { // must not move anything // { // must not move anything
// uchar array[8]; // pointer to data // uchar array[8]; // pointer to data
// uchar nel[4]; // number of elements // uchar nel[4]; // number of elements
// uchar cap[4]; // allocated number of elements // uchar cap[4]; // allocated number of elements
// } Array; // } Slice;
var array_array int // runtime offsetof(Array,array) - same for String var slice_array int // runtime offsetof(Slice,array) - same for String
var array_nel int // runtime offsetof(Array,nel) - same for String var slice_nel int // runtime offsetof(Slice,nel) - same for String
var array_cap int // runtime offsetof(Array,cap) var slice_cap int // runtime offsetof(Slice,cap)
var sizeof_Array int // runtime sizeof(Array) var sizeof_Slice int // runtime sizeof(Slice)
// note this is the runtime representation // note this is the runtime representation
// of the compilers strings. // of the compilers strings.
......
...@@ -130,11 +130,11 @@ func (s *InitSchedule) staticcopy(l *Node, r *Node) bool { ...@@ -130,11 +130,11 @@ func (s *InitSchedule) staticcopy(l *Node, r *Node) bool {
a := s.inittemps[r] a := s.inittemps[r]
n := l.copy() n := l.copy()
n.Xoffset = l.Xoffset + int64(array_array) n.Xoffset = l.Xoffset + int64(slice_array)
gdata(n, nod(OADDR, a, nil), Widthptr) gdata(n, nod(OADDR, a, nil), Widthptr)
n.Xoffset = l.Xoffset + int64(array_nel) n.Xoffset = l.Xoffset + int64(slice_nel)
gdata(n, r.Right, Widthptr) gdata(n, r.Right, Widthptr)
n.Xoffset = l.Xoffset + int64(array_cap) n.Xoffset = l.Xoffset + int64(slice_cap)
gdata(n, r.Right, Widthptr) gdata(n, r.Right, Widthptr)
return true return true
...@@ -227,11 +227,11 @@ func (s *InitSchedule) staticassign(l *Node, r *Node) bool { ...@@ -227,11 +227,11 @@ func (s *InitSchedule) staticassign(l *Node, r *Node) bool {
a := staticname(ta) a := staticname(ta)
s.inittemps[r] = a s.inittemps[r] = a
n := l.copy() n := l.copy()
n.Xoffset = l.Xoffset + int64(array_array) n.Xoffset = l.Xoffset + int64(slice_array)
gdata(n, nod(OADDR, a, nil), Widthptr) gdata(n, nod(OADDR, a, nil), Widthptr)
n.Xoffset = l.Xoffset + int64(array_nel) n.Xoffset = l.Xoffset + int64(slice_nel)
gdata(n, r.Right, Widthptr) gdata(n, r.Right, Widthptr)
n.Xoffset = l.Xoffset + int64(array_cap) n.Xoffset = l.Xoffset + int64(slice_cap)
gdata(n, r.Right, Widthptr) gdata(n, r.Right, Widthptr)
// Fall through to init underlying array. // Fall through to init underlying array.
...@@ -615,11 +615,11 @@ func slicelit(ctxt initContext, n *Node, var_ *Node, init *Nodes) { ...@@ -615,11 +615,11 @@ func slicelit(ctxt initContext, n *Node, var_ *Node, init *Nodes) {
v.Type = types.Types[TINT] v.Type = types.Types[TINT]
setintconst(&v, t.NumElem()) setintconst(&v, t.NumElem())
nam.Xoffset += int64(array_array) nam.Xoffset += int64(slice_array)
gdata(&nam, nod(OADDR, vstat, nil), Widthptr) gdata(&nam, nod(OADDR, vstat, nil), Widthptr)
nam.Xoffset += int64(array_nel) - int64(array_array) nam.Xoffset += int64(slice_nel) - int64(slice_array)
gdata(&nam, &v, Widthptr) gdata(&nam, &v, Widthptr)
nam.Xoffset += int64(array_cap) - int64(array_nel) nam.Xoffset += int64(slice_cap) - int64(slice_nel)
gdata(&nam, &v, Widthptr) gdata(&nam, &v, Widthptr)
return return
......
...@@ -2815,7 +2815,7 @@ func (s *state) append(n *Node, inplace bool) *ssa.Value { ...@@ -2815,7 +2815,7 @@ func (s *state) append(n *Node, inplace bool) *ssa.Value {
// Tell liveness we're about to build a new slice // Tell liveness we're about to build a new slice
s.vars[&memVar] = s.newValue1A(ssa.OpVarDef, types.TypeMem, sn, s.mem()) s.vars[&memVar] = s.newValue1A(ssa.OpVarDef, types.TypeMem, sn, s.mem())
} }
capaddr := s.newValue1I(ssa.OpOffPtr, s.f.Config.Types.IntPtr, int64(array_cap), addr) capaddr := s.newValue1I(ssa.OpOffPtr, s.f.Config.Types.IntPtr, int64(slice_cap), addr)
s.store(types.Types[TINT], capaddr, r[2]) s.store(types.Types[TINT], capaddr, r[2])
s.store(pt, addr, r[0]) s.store(pt, addr, r[0])
// load the value we just stored to avoid having to spill it // load the value we just stored to avoid having to spill it
...@@ -2836,7 +2836,7 @@ func (s *state) append(n *Node, inplace bool) *ssa.Value { ...@@ -2836,7 +2836,7 @@ func (s *state) append(n *Node, inplace bool) *ssa.Value {
if inplace { if inplace {
l = s.variable(&lenVar, types.Types[TINT]) // generates phi for len l = s.variable(&lenVar, types.Types[TINT]) // generates phi for len
nl = s.newValue2(s.ssaOp(OADD, types.Types[TINT]), types.Types[TINT], l, s.constInt(types.Types[TINT], nargs)) nl = s.newValue2(s.ssaOp(OADD, types.Types[TINT]), types.Types[TINT], l, s.constInt(types.Types[TINT], nargs))
lenaddr := s.newValue1I(ssa.OpOffPtr, s.f.Config.Types.IntPtr, int64(array_nel), addr) lenaddr := s.newValue1I(ssa.OpOffPtr, s.f.Config.Types.IntPtr, int64(slice_nel), addr)
s.store(types.Types[TINT], lenaddr, nl) s.store(types.Types[TINT], lenaddr, nl)
} }
......
...@@ -342,13 +342,13 @@ func typeinit() { ...@@ -342,13 +342,13 @@ func typeinit() {
simtype[TFUNC] = TPTR simtype[TFUNC] = TPTR
simtype[TUNSAFEPTR] = TPTR simtype[TUNSAFEPTR] = TPTR
array_array = int(Rnd(0, int64(Widthptr))) slice_array = int(Rnd(0, int64(Widthptr)))
array_nel = int(Rnd(int64(array_array)+int64(Widthptr), int64(Widthptr))) slice_nel = int(Rnd(int64(slice_array)+int64(Widthptr), int64(Widthptr)))
array_cap = int(Rnd(int64(array_nel)+int64(Widthptr), int64(Widthptr))) slice_cap = int(Rnd(int64(slice_nel)+int64(Widthptr), int64(Widthptr)))
sizeof_Array = int(Rnd(int64(array_cap)+int64(Widthptr), int64(Widthptr))) sizeof_Slice = int(Rnd(int64(slice_cap)+int64(Widthptr), int64(Widthptr)))
// string is same as slice wo the cap // string is same as slice wo the cap
sizeof_String = int(Rnd(int64(array_nel)+int64(Widthptr), int64(Widthptr))) sizeof_String = int(Rnd(int64(slice_nel)+int64(Widthptr), int64(Widthptr)))
dowidth(types.Types[TSTRING]) dowidth(types.Types[TSTRING])
dowidth(types.Idealstring) dowidth(types.Idealstring)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment