From b9dbb030d5e7d2733e877972568368dc806b7304 Mon Sep 17 00:00:00 2001 From: =?utf8?q?H=C3=A5vard=20Haugen?= Date: Sun, 13 Sep 2015 22:58:12 +0200 Subject: [PATCH] cmd/compiler/internal/gc: make Type.Copyto a []*Node Passes go build -a -toolexec 'toolstash -cmp' std cmd Change-Id: Ief4613cfb341172a85e3a894f44fb2bb308c7b55 Reviewed-on: https://go-review.googlesource.com/14554 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Dave Cheney --- src/cmd/compile/internal/gc/go.go | 2 +- src/cmd/compile/internal/gc/typecheck.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cmd/compile/internal/gc/go.go b/src/cmd/compile/internal/gc/go.go index f360378a43..a39cc6d489 100644 --- a/src/cmd/compile/internal/gc/go.go +++ b/src/cmd/compile/internal/gc/go.go @@ -210,7 +210,7 @@ type Type struct { Embedlineno int32 // first use of TFORW as embedded type // for TFORW, where to copy the eventual value to - Copyto *NodeList + Copyto []*Node Lastfn *Node // for usefield } diff --git a/src/cmd/compile/internal/gc/typecheck.go b/src/cmd/compile/internal/gc/typecheck.go index 8989371e91..bb75a034a0 100644 --- a/src/cmd/compile/internal/gc/typecheck.go +++ b/src/cmd/compile/internal/gc/typecheck.go @@ -3544,7 +3544,7 @@ var mapqueue *NodeList func copytype(n *Node, t *Type) { if t.Etype == TFORW { // This type isn't computed yet; when it is, update n. - t.Copyto = list(t.Copyto, n) + t.Copyto = append(t.Copyto, n) return } @@ -3569,8 +3569,8 @@ func copytype(n *Node, t *Type) { t.Copyto = nil // Update nodes waiting on this type. - for ; l != nil; l = l.Next { - copytype(l.N, t) + for _, n := range l { + copytype(n, t) } // Double-check use of type as embedded type. -- 2.48.1