cmd/compile: make importlist a []*Node instead of *NodeList

Passes go build -a -toolexec 'toolstash -cmp' std.

Change-Id: Ica62765d3c1ef052afed34da1b3ac3f80646cc55
Reviewed-on: https://go-review.googlesource.com/14318
Reviewed-by: Dave Cheney <dave@cheney.net>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/compile/internal/gc/go.go b/src/cmd/compile/internal/gc/go.go
index f87f7bb2a4eb352d811c06b7324940dd8f660a46..59e1780b7d3213707d2c61b6e7c8916d8fdec28a 100644 (file)
--- a/src/cmd/compile/internal/gc/go.go
+++ b/src/cmd/compile/internal/gc/go.go
@@ -589,7 +589,7 @@ var externdcl *NodeList
 
 var exportlist []*Node
 
-var importlist *NodeList // imported functions and methods with inlinable bodies
+var importlist []*Node // imported functions and methods with inlinable bodies
 
 var funcsyms *NodeList
 

diff --git a/src/cmd/compile/internal/gc/go.y b/src/cmd/compile/internal/gc/go.y
index ea8ac4fd9c8ca9d84e3168f8cfd0ee04b062d7f4..32f02ded6d3c4827ece29430ef2d10798222fb2b 100644 (file)
--- a/src/cmd/compile/internal/gc/go.y
+++ b/src/cmd/compile/internal/gc/go.y
@@ -2038,7 +2038,7 @@ hidden_import:
                $2.Func.Inl = $3;
 
                funcbody($2);
-               importlist = list(importlist, $2);
+               importlist = append(importlist, $2);
 
                if Debug['E'] > 0 {
                        fmt.Printf("import [%q] func %v \n", importpkg.Path, $2)

diff --git a/src/cmd/compile/internal/gc/lex.go b/src/cmd/compile/internal/gc/lex.go
index f2c6398ca2f1bcf5c93e34d3d347cf2ba3bf4127..ce0654e54bbab9237b35eda610d7dcc86f30ed8c 100644 (file)
--- a/src/cmd/compile/internal/gc/lex.go
+++ b/src/cmd/compile/internal/gc/lex.go
@@ -423,10 +423,10 @@ func Main() {
        if Debug['l'] > 1 {
                // Typecheck imported function bodies if debug['l'] > 1,
                // otherwise lazily when used or re-exported.
-               for l := importlist; l != nil; l = l.Next {
-                       if l.N.Func.Inl != nil {
+               for _, n := range importlist {
+                       if n.Func.Inl != nil {
                                saveerrors()
-                               typecheckinl(l.N)
+                               typecheckinl(n)
                        }
                }
 

diff --git a/src/cmd/compile/internal/gc/y.go b/src/cmd/compile/internal/gc/y.go
index 709471a789b6b4bd2f72651aef54991f9d307942..9b780353c34ecbd79f517a5f81cbc16c13639b0e 100644 (file)
--- a/src/cmd/compile/internal/gc/y.go
+++ b/src/cmd/compile/internal/gc/y.go
@@ -3241,7 +3241,7 @@ yydefault:
                        yyDollar[2].node.Func.Inl = yyDollar[3].list
 
                        funcbody(yyDollar[2].node)
-                       importlist = list(importlist, yyDollar[2].node)
+                       importlist = append(importlist, yyDollar[2].node)
 
                        if Debug['E'] > 0 {
                                fmt.Printf("import [%q] func %v \n", importpkg.Path, yyDollar[2].node)