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

cmd/compile: move sinit.go globals into InitSchedule

Browse source 
Eliminates global state from sinit.go.

Passes toolstash-check.

Updates #22326.

Change-Id: Ie3cb14bff625baa20134d1488962ab02d24f0c15
Reviewed-on: https://go-review.googlesource.com/c/go/+/169899
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Matthew Dempsky 2019-03-25 12:35:42 -07:00
parent 57bd577454
commit d23bf3daa9
1 changed files with 41 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

84
src/cmd/compile/internal/gc/sinit.go
View file

@ -27,19 +27,16 @@ type InitPlan struct {
} }
type InitSchedule struct { type InitSchedule struct {
out []*Node out []*Node
initlist []*Node
initplans map[*Node]*InitPlan
inittemps map[*Node]*Node
} }
func (s *InitSchedule) append(n *Node) { func (s *InitSchedule) append(n *Node) {
s.out = append(s.out, n) s.out = append(s.out, n)
} }
var (
initlist []*Node
initplans map[*Node]*InitPlan
inittemps = make(map[*Node]*Node)
)
// init1 walks the AST starting at n, and accumulates in out // init1 walks the AST starting at n, and accumulates in out
// the list of definitions needing init code in dependency order. // the list of definitions needing init code in dependency order.
func (s *InitSchedule) init1(n *Node) { func (s *InitSchedule) init1(n *Node) {
@ -86,16 +83,16 @@ func (s *InitSchedule) init1(n *Node) {
// a variable in the program, the tree walk will reach a cycle // a variable in the program, the tree walk will reach a cycle
// involving that variable. // involving that variable.
if n.Class() != PFUNC { if n.Class() != PFUNC {
foundinitloop(n, n) s.foundinitloop(n, n)
} }
for i := len(initlist) - 1; i >= 0; i-- { for i := len(s.initlist) - 1; i >= 0; i-- {
x := initlist[i] x := s.initlist[i]
if x == n { if x == n {
break break
} }
if x.Class() != PFUNC { if x.Class() != PFUNC {
foundinitloop(n, x) s.foundinitloop(n, x)
} }
} }
@ -105,7 +102,7 @@ func (s *InitSchedule) init1(n *Node) {
// reached a new unvisited node. // reached a new unvisited node.
n.SetInitorder(InitPending) n.SetInitorder(InitPending)
initlist = append(initlist, n) s.initlist = append(s.initlist, n)
// make sure that everything n depends on is initialized. // make sure that everything n depends on is initialized.
// n->defn is an assignment to n // n->defn is an assignment to n
@ -157,18 +154,18 @@ func (s *InitSchedule) init1(n *Node) {
} }
} }
last := len(initlist) - 1 last := len(s.initlist) - 1
if initlist[last] != n { if s.initlist[last] != n {
Fatalf("bad initlist %v", initlist) Fatalf("bad initlist %v", s.initlist)
} }
initlist[last] = nil // allow GC s.initlist[last] = nil // allow GC
initlist = initlist[:last] s.initlist = s.initlist[:last]
n.SetInitorder(InitDone) n.SetInitorder(InitDone)
} }
// foundinitloop prints an init loop error and exits. // foundinitloop prints an init loop error and exits.
func foundinitloop(node, visited *Node) { func (s *InitSchedule) foundinitloop(node, visited *Node) {
// If there have already been errors printed, // If there have already been errors printed,
// those errors probably confused us and // those errors probably confused us and
// there might not be a loop. Let the user // there might not be a loop. Let the user
@ -180,9 +177,9 @@ func foundinitloop(node, visited *Node) {
// Find the index of node and visited in the initlist. // Find the index of node and visited in the initlist.
var nodeindex, visitedindex int var nodeindex, visitedindex int
for ; initlist[nodeindex] != node; nodeindex++ { for ; s.initlist[nodeindex] != node; nodeindex++ {
} }
for ; initlist[visitedindex] != visited; visitedindex++ { for ; s.initlist[visitedindex] != visited; visitedindex++ {
} }
// There is a loop involving visited. We know about node and // There is a loop involving visited. We know about node and
@ -190,12 +187,12 @@ func foundinitloop(node, visited *Node) {
fmt.Printf("%v: initialization loop:\n", visited.Line()) fmt.Printf("%v: initialization loop:\n", visited.Line())
// Print visited -> ... -> n1 -> node. // Print visited -> ... -> n1 -> node.
for _, n := range initlist[visitedindex:] { for _, n := range s.initlist[visitedindex:] {
fmt.Printf("\t%v %v refers to\n", n.Line(), n.Sym) fmt.Printf("\t%v %v refers to\n", n.Line(), n.Sym)
} }
// Print node -> ... -> visited. // Print node -> ... -> visited.
for _, n := range initlist[nodeindex:visitedindex] { for _, n := range s.initlist[nodeindex:visitedindex] {
fmt.Printf("\t%v %v refers to\n", n.Line(), n.Sym) fmt.Printf("\t%v %v refers to\n", n.Line(), n.Sym)
} }
@ -252,12 +249,13 @@ func (s *InitSchedule) initreorder(l []*Node) {
// declarations and outputs the corresponding list of statements // declarations and outputs the corresponding list of statements
// to include in the init() function body. // to include in the init() function body.
func initfix(l []*Node) []*Node { func initfix(l []*Node) []*Node {
var s InitSchedule s := InitSchedule{
initplans = make(map[*Node]*InitPlan) initplans: make(map[*Node]*InitPlan),
inittemps: make(map[*Node]*Node),
}
lno := lineno lno := lineno
s.initreorder(l) s.initreorder(l)
lineno = lno lineno = lno
initplans = nil
return s.out return s.out
} }
@ -328,13 +326,13 @@ func (s *InitSchedule) staticcopy(l *Node, r *Node) bool {
switch r.Left.Op { switch r.Left.Op {
case OARRAYLIT, OSLICELIT, OSTRUCTLIT, OMAPLIT: case OARRAYLIT, OSLICELIT, OSTRUCTLIT, OMAPLIT:
// copy pointer // copy pointer
gdata(l, nod(OADDR, inittemps[r], nil), int(l.Type.Width)) gdata(l, nod(OADDR, s.inittemps[r], nil), int(l.Type.Width))
return true return true
} }
case OSLICELIT: case OSLICELIT:
// copy slice // copy slice
a := inittemps[r] a := s.inittemps[r]
n := l.copy() n := l.copy()
n.Xoffset = l.Xoffset + int64(array_array) n.Xoffset = l.Xoffset + int64(array_array)
@ -346,7 +344,7 @@ func (s *InitSchedule) staticcopy(l *Node, r *Node) bool {
return true return true
case OARRAYLIT, OSTRUCTLIT: case OARRAYLIT, OSTRUCTLIT:
p := initplans[r] p := s.initplans[r]
n := l.copy() n := l.copy()
for i := range p.E { for i := range p.E {
@ -408,7 +406,7 @@ func (s *InitSchedule) staticassign(l *Node, r *Node) bool {
// Init pointer. // Init pointer.
a := staticname(r.Left.Type) a := staticname(r.Left.Type)
inittemps[r] = a s.inittemps[r] = a
gdata(l, nod(OADDR, a, nil), int(l.Type.Width)) gdata(l, nod(OADDR, a, nil), int(l.Type.Width))
// Init underlying literal. // Init underlying literal.
@ -427,12 +425,12 @@ func (s *InitSchedule) staticassign(l *Node, r *Node) bool {
} }
case OSLICELIT: case OSLICELIT:
initplan(r) s.initplan(r)
// Init slice. // Init slice.
bound := r.Right.Int64() bound := r.Right.Int64()
ta := types.NewArray(r.Type.Elem(), bound) ta := types.NewArray(r.Type.Elem(), bound)
a := staticname(ta) a := staticname(ta)
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(array_array)
gdata(n, nod(OADDR, a, nil), Widthptr) gdata(n, nod(OADDR, a, nil), Widthptr)
@ -446,9 +444,9 @@ func (s *InitSchedule) staticassign(l *Node, r *Node) bool {
fallthrough fallthrough
case OARRAYLIT, OSTRUCTLIT: case OARRAYLIT, OSTRUCTLIT:
initplan(r) s.initplan(r)
p := initplans[r] p := s.initplans[r]
n := l.copy() n := l.copy()
for i := range p.E { for i := range p.E {
e := &p.E[i] e := &p.E[i]
@ -530,7 +528,7 @@ func (s *InitSchedule) staticassign(l *Node, r *Node) bool {
} else { } else {
// Construct temp to hold val, write pointer to temp into n. // Construct temp to hold val, write pointer to temp into n.
a := staticname(val.Type) a := staticname(val.Type)
inittemps[val] = a s.inittemps[val] = a
if !s.staticassign(a, val) { if !s.staticassign(a, val) {
s.append(nod(OAS, a, val)) s.append(nod(OAS, a, val))
} }
@ -1251,12 +1249,12 @@ func stataddr(nam *Node, n *Node) bool {
return false return false
} }
func initplan(n *Node) { func (s *InitSchedule) initplan(n *Node) {
if initplans[n] != nil { if s.initplans[n] != nil {
return return
} }
p := new(InitPlan) p := new(InitPlan)
initplans[n] = p s.initplans[n] = p
switch n.Op { switch n.Op {
default: default:
Fatalf("initplan") Fatalf("initplan")
@ -1271,7 +1269,7 @@ func initplan(n *Node) {
} }
a = a.Right a = a.Right
} }
addvalue(p, k*n.Type.Elem().Width, a) s.addvalue(p, k*n.Type.Elem().Width, a)
k++ k++
} }
@ -1280,7 +1278,7 @@ func initplan(n *Node) {
if a.Op != OSTRUCTKEY { if a.Op != OSTRUCTKEY {
Fatalf("initplan structlit") Fatalf("initplan structlit")
} }
addvalue(p, a.Xoffset, a.Left) s.addvalue(p, a.Xoffset, a.Left)
} }
case OMAPLIT: case OMAPLIT:
@ -1288,12 +1286,12 @@ func initplan(n *Node) {
if a.Op != OKEY { if a.Op != OKEY {
Fatalf("initplan maplit") Fatalf("initplan maplit")
} }
addvalue(p, -1, a.Right) s.addvalue(p, -1, a.Right)
} }
} }
} }
func addvalue(p *InitPlan, xoffset int64, n *Node) { func (s *InitSchedule) addvalue(p *InitPlan, xoffset int64, n *Node) {
// special case: zero can be dropped entirely // special case: zero can be dropped entirely
if isZero(n) { if isZero(n) {
return return
@ -1301,8 +1299,8 @@ func addvalue(p *InitPlan, xoffset int64, n *Node) {
// special case: inline struct and array (not slice) literals // special case: inline struct and array (not slice) literals
if isvaluelit(n) { if isvaluelit(n) {
initplan(n) s.initplan(n)
q := initplans[n] q := s.initplans[n]
for _, qe := range q.E { for _, qe := range q.E {
// qe is a copy; we are not modifying entries in q.E // qe is a copy; we are not modifying entries in q.E
qe.Xoffset += xoffset qe.Xoffset += xoffset