cmd/compile/internal: some janitoring

Nicer swaps, loops (removed tmp variables). Use of bool instead of int.

This change passes go build -toolexec 'toolstash -cmp' -a std.

Change-Id: I541904c74b57297848decc51a8a4913a8eca4af3
Reviewed-on: https://go-review.googlesource.com/14316
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/compile/internal/amd64/ggen.go b/src/cmd/compile/internal/amd64/ggen.go
index 5aae563241328ab1bc80d5dee4c1e7ca81d434f0..f1f4955d4ac5719b8d0620f0f21150faed8136fa 100644 (file)
--- a/src/cmd/compile/internal/amd64/ggen.go
+++ b/src/cmd/compile/internal/amd64/ggen.go
@@ -187,13 +187,13 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) {
        t := nl.Type
 
        t0 := t
-       check := 0
+       check := false
        if gc.Issigned[t.Etype] {
-               check = 1
+               check = true
                if gc.Isconst(nl, gc.CTINT) && nl.Int() != -(1<<uint64(t.Width*8-1)) {
-                       check = 0
+                       check = false
                } else if gc.Isconst(nr, gc.CTINT) && nr.Int() != -1 {
-                       check = 0
+                       check = false
                }
        }
 
@@ -203,7 +203,7 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) {
                } else {
                        t = gc.Types[gc.TUINT32]
                }
-               check = 0
+               check = false
        }
 
        a := optoas(op, t)
@@ -252,7 +252,7 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) {
        }
 
        var p2 *obj.Prog
-       if check != 0 {
+       if check {
                gc.Nodconst(&n4, t, -1)
                gins(optoas(gc.OCMP, t), &n3, &n4)
                p1 := gc.Gbranch(optoas(gc.ONE, t), nil, +1)
@@ -289,7 +289,7 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) {
                gmove(&dx, res)
        }
        restx(&dx, &olddx)
-       if check != 0 {
+       if check {
                gc.Patch(p2, gc.Pc)
        }
        restx(&ax, &oldax)
@@ -340,9 +340,7 @@ func cgen_hmul(nl *gc.Node, nr *gc.Node, res *gc.Node) {
        t := nl.Type
        a := optoas(gc.OHMUL, t)
        if nl.Ullman < nr.Ullman {
-               tmp := nl
-               nl = nr
-               nr = tmp
+               nl, nr = nr, nl
        }
 
        var n1 gc.Node
@@ -500,9 +498,7 @@ func cgen_bmul(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) bool {
 
        // largest ullman on left.
        if nl.Ullman < nr.Ullman {
-               tmp := nl
-               nl = nr
-               nr = tmp
+               nl, nr = nr, nl
        }
 
        // generate operands in "8-bit" registers.
@@ -564,12 +560,7 @@ func clearfat(nl *gc.Node) {
                n1.Op = gc.OINDREG
                var z gc.Node
                gc.Nodconst(&z, gc.Types[gc.TUINT64], 0)
-               for {
-                       tmp14 := q
-                       q--
-                       if tmp14 <= 0 {
-                               break
-                       }
+               for ; q > 0; q-- {
                        n1.Type = z.Type
                        gins(x86.AMOVQ, &z, &n1)
                        n1.Xoffset += 8
@@ -584,12 +575,7 @@ func clearfat(nl *gc.Node) {
                }
 
                gc.Nodconst(&z, gc.Types[gc.TUINT8], 0)
-               for {
-                       tmp15 := c
-                       c--
-                       if tmp15 <= 0 {
-                               break
-                       }
+               for ; c > 0; c-- {
                        n1.Type = z.Type
                        gins(x86.AMOVB, &z, &n1)
                        n1.Xoffset++

diff --git a/src/cmd/compile/internal/arm/cgen.go b/src/cmd/compile/internal/arm/cgen.go
index 6c1a84c417719800f78a4de07eaf63ff9461eeec..289da5d8881644596455523da6a890f2fb2bc5f4 100644 (file)
--- a/src/cmd/compile/internal/arm/cgen.go
+++ b/src/cmd/compile/internal/arm/cgen.go
@@ -205,12 +205,7 @@ func blockcopy(n, res *gc.Node, osrc, odst, w int64) {
                gc.Regfree(&nend)
        } else {
                var p *obj.Prog
-               for {
-                       tmp14 := c
-                       c--
-                       if tmp14 <= 0 {
-                               break
-                       }
+               for ; c > 0; c-- {
                        p = gins(op, &src, &tmp)
                        p.From.Type = obj.TYPE_MEM
                        p.From.Offset = int64(dir)

diff --git a/src/cmd/compile/internal/arm/ggen.go b/src/cmd/compile/internal/arm/ggen.go
index 8ab384eada4ac277cb8cd33283366009b1f291d9..193d4af27dd4d969312f2304bbac429324ed683c 100644 (file)
--- a/src/cmd/compile/internal/arm/ggen.go
+++ b/src/cmd/compile/internal/arm/ggen.go
@@ -120,9 +120,7 @@ func appendpp(p *obj.Prog, as int, ftype int, freg int, foffset int32, ttype int
  */
 func cgen_hmul(nl *gc.Node, nr *gc.Node, res *gc.Node) {
        if nl.Ullman < nr.Ullman {
-               tmp := nl
-               nl = nr
-               nr = tmp
+               nl, nr = nr, nl
        }
 
        t := nl.Type

diff --git a/src/cmd/compile/internal/arm64/cgen.go b/src/cmd/compile/internal/arm64/cgen.go
index 9a7a8f948233e11b497e4b9b2329d5c304bfb0a3..a7f1c18b55ed2027aa6642d6818404237342cf0f 100644 (file)
--- a/src/cmd/compile/internal/arm64/cgen.go
+++ b/src/cmd/compile/internal/arm64/cgen.go
@@ -132,13 +132,7 @@ func blockcopy(n, res *gc.Node, osrc, odst, w int64) {
                // ADDs.  That will produce shorter, more
                // pipeline-able code.
                var p *obj.Prog
-               for {
-                       tmp14 := c
-                       c--
-                       if tmp14 <= 0 {
-                               break
-                       }
-
+               for ; c > 0; c-- {
                        p = gins(op, &src, &tmp)
                        p.From.Type = obj.TYPE_MEM
                        p.From.Offset = int64(dir)

diff --git a/src/cmd/compile/internal/arm64/ggen.go b/src/cmd/compile/internal/arm64/ggen.go
index b647fce1410a9aba46fc3f3c52a985645e217461..2cbd6637d3079ec2f3eef92045e421d9babecfef 100644 (file)
--- a/src/cmd/compile/internal/arm64/ggen.go
+++ b/src/cmd/compile/internal/arm64/ggen.go
@@ -151,13 +151,13 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) {
        t := nl.Type
 
        t0 := t
-       check := 0
+       check := false
        if gc.Issigned[t.Etype] {
-               check = 1
+               check = true
                if gc.Isconst(nl, gc.CTINT) && nl.Int() != -(1<<uint64(t.Width*8-1)) {
-                       check = 0
+                       check = false
                } else if gc.Isconst(nr, gc.CTINT) && nr.Int() != -1 {
-                       check = 0
+                       check = false
                }
        }
 
@@ -167,7 +167,7 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) {
                } else {
                        t = gc.Types[gc.TUINT64]
                }
-               check = 0
+               check = false
        }
 
        a := optoas(gc.ODIV, t)
@@ -206,7 +206,7 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) {
        gc.Patch(p1, gc.Pc)
 
        var p2 *obj.Prog
-       if check != 0 {
+       if check {
                var nm1 gc.Node
                gc.Nodconst(&nm1, t, -1)
                gcmp(optoas(gc.OCMP, t), &tr, &nm1)
@@ -250,7 +250,7 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) {
        }
 
        gc.Regfree(&tl)
-       if check != 0 {
+       if check {
                gc.Patch(p2, gc.Pc)
        }
 }
@@ -262,9 +262,7 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) {
 func cgen_hmul(nl *gc.Node, nr *gc.Node, res *gc.Node) {
        // largest ullman on left.
        if nl.Ullman < nr.Ullman {
-               tmp := (*gc.Node)(nl)
-               nl = nr
-               nr = tmp
+               nl, nr = nr, nl
        }
 
        t := (*gc.Type)(nl.Type)

diff --git a/src/cmd/compile/internal/gc/cgen.go b/src/cmd/compile/internal/gc/cgen.go
index b979340862c8877aabf048f27beded5b9651b595..860db34f483468ec0ae62e1623e0df607764ff4a 100644 (file)
--- a/src/cmd/compile/internal/gc/cgen.go
+++ b/src/cmd/compile/internal/gc/cgen.go
@@ -705,9 +705,7 @@ func cgen_wb(n, res *Node, wb bool) {
         */
 sbop: // symmetric binary
        if nl.Ullman < nr.Ullman || (nl.Ullman == nr.Ullman && (Smallintconst(nl) || (nr.Op == OLITERAL && !Smallintconst(nr)))) {
-               r := nl
-               nl = nr
-               nr = r
+               nl, nr = nr, nl
        }
 
 abop: // asymmetric binary

diff --git a/src/cmd/compile/internal/gc/plive.go b/src/cmd/compile/internal/gc/plive.go
index 2d8a0ba2c8db99546a1a8e2c4c67bdd4a9d2f3b7..fa8bc20f14ef869a61b42b887c8b6fa2dc201036 100644 (file)
--- a/src/cmd/compile/internal/gc/plive.go
+++ b/src/cmd/compile/internal/gc/plive.go
@@ -1685,15 +1685,13 @@ func livenessprintdebug(lv *Liveness) {
                                for j = 0; j < len(lv.vars); j++ {
                                        n = lv.vars[j]
                                        if islive(n, args, locals) {
-                                               tmp9 := printed
-                                               printed++
-                                               if tmp9 != 0 {
+                                               if printed != 0 {
                                                        fmt.Printf(",")
                                                }
                                                fmt.Printf("%v", n)
+                                               printed++
                                        }
                                }
-
                                fmt.Printf("\n")
                        }
 

diff --git a/src/cmd/compile/internal/gc/subr.go b/src/cmd/compile/internal/gc/subr.go
index ba960a858f3140e32429dc265648286a6165b3dd..605597fb69f2d6acb1ac1360fd408b65ad33df89 100644 (file)
--- a/src/cmd/compile/internal/gc/subr.go
+++ b/src/cmd/compile/internal/gc/subr.go
@@ -665,12 +665,7 @@ func sortinter(t *Type) *Type {
                i++
        }
        sort.Sort(methcmp(a[:i]))
-       for {
-               tmp11 := i
-               i--
-               if tmp11 <= 0 {
-                       break
-               }
+       for i--; i >= 0; i-- {
                a[i].Down = f
                f = a[i]
        }

diff --git a/src/cmd/compile/internal/gc/typecheck.go b/src/cmd/compile/internal/gc/typecheck.go
index 7c9d85fb69049de4ebb5ae72e1bff264c18ce126..fdeaa5bcccbd979301cab31fb25f2552c66c87e5 100644 (file)
--- a/src/cmd/compile/internal/gc/typecheck.go
+++ b/src/cmd/compile/internal/gc/typecheck.go
@@ -3073,11 +3073,10 @@ func typecheckcomplit(np **Node) {
                                setlineno(ll.N)
                                typecheck(&ll.N, Erv)
                                if f == nil {
-                                       tmp12 := bad
-                                       bad++
-                                       if tmp12 == 0 {
+                                       if bad == 0 {
                                                Yyerror("too many values in struct initializer")
                                        }
+                                       bad++
                                        continue
                                }
 
@@ -3110,11 +3109,10 @@ func typecheckcomplit(np **Node) {
                                l = ll.N
                                setlineno(l)
                                if l.Op != OKEY {
-                                       tmp13 := bad
-                                       bad++
-                                       if tmp13 == 0 {
+                                       if bad == 0 {
                                                Yyerror("mixture of field:value and value initializers")
                                        }
+                                       bad++
                                        typecheck(&ll.N, Erv)
                                        continue
                                }

diff --git a/src/cmd/compile/internal/ppc64/cgen.go b/src/cmd/compile/internal/ppc64/cgen.go
index 4f3092c9ef4789cd24032581be9cfcd952b66e54..740e64cc8351d8b0d6371b6fe24d571b2ce22ab1 100644 (file)
--- a/src/cmd/compile/internal/ppc64/cgen.go
+++ b/src/cmd/compile/internal/ppc64/cgen.go
@@ -126,13 +126,7 @@ func blockcopy(n, res *gc.Node, osrc, odst, w int64) {
                // ADDs.  That will produce shorter, more
                // pipeline-able code.
                var p *obj.Prog
-               for {
-                       tmp14 := c
-                       c--
-                       if tmp14 <= 0 {
-                               break
-                       }
-
+               for ; c > 0; c-- {
                        p = gins(op, &src, &tmp)
                        p.From.Type = obj.TYPE_MEM
                        p.From.Offset = int64(dir)

diff --git a/src/cmd/compile/internal/ppc64/ggen.go b/src/cmd/compile/internal/ppc64/ggen.go
index 2779140ca01fcede8af21f849d150eba5d3074c2..173e2f0c6c2f3304ffe2bc4d49460d6db0be31b5 100644 (file)
--- a/src/cmd/compile/internal/ppc64/ggen.go
+++ b/src/cmd/compile/internal/ppc64/ggen.go
@@ -141,13 +141,13 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) {
        t := nl.Type
 
        t0 := t
-       check := 0
+       check := false
        if gc.Issigned[t.Etype] {
-               check = 1
+               check = true
                if gc.Isconst(nl, gc.CTINT) && nl.Int() != -(1<<uint64(t.Width*8-1)) {
-                       check = 0
+                       check = false
                } else if gc.Isconst(nr, gc.CTINT) && nr.Int() != -1 {
-                       check = 0
+                       check = false
                }
        }
 
@@ -157,7 +157,7 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) {
                } else {
                        t = gc.Types[gc.TUINT64]
                }
-               check = 0
+               check = false
        }
 
        a := optoas(gc.ODIV, t)
@@ -198,7 +198,7 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) {
        gc.Patch(p1, gc.Pc)
 
        var p2 *obj.Prog
-       if check != 0 {
+       if check {
                var nm1 gc.Node
                gc.Nodconst(&nm1, t, -1)
                gins(optoas(gc.OCMP, t), &tr, &nm1)
@@ -242,7 +242,7 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) {
        }
 
        gc.Regfree(&tl)
-       if check != 0 {
+       if check {
                gc.Patch(p2, gc.Pc)
        }
 }
@@ -254,9 +254,7 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) {
 func cgen_hmul(nl *gc.Node, nr *gc.Node, res *gc.Node) {
        // largest ullman on left.
        if nl.Ullman < nr.Ullman {
-               tmp := (*gc.Node)(nl)
-               nl = nr
-               nr = tmp
+               nl, nr = nr, nl
        }
 
        t := (*gc.Type)(nl.Type)

diff --git a/src/cmd/compile/internal/x86/ggen.go b/src/cmd/compile/internal/x86/ggen.go
index be865e5aad9908d65802d1ff1f351a326ef19a08..85ae808c31d5c644aa263902c27299ec3a565f11 100644 (file)
--- a/src/cmd/compile/internal/x86/ggen.go
+++ b/src/cmd/compile/internal/x86/ggen.go
@@ -133,24 +133,14 @@ func clearfat(nl *gc.Node) {
                n1.Op = gc.OINDREG
                var z gc.Node
                gc.Nodconst(&z, gc.Types[gc.TUINT64], 0)
-               for {
-                       tmp14 := q
-                       q--
-                       if tmp14 <= 0 {
-                               break
-                       }
+               for ; q > 0; q-- {
                        n1.Type = z.Type
                        gins(x86.AMOVL, &z, &n1)
                        n1.Xoffset += 4
                }
 
                gc.Nodconst(&z, gc.Types[gc.TUINT8], 0)
-               for {
-                       tmp15 := c
-                       c--
-                       if tmp15 <= 0 {
-                               break
-                       }
+               for ; c > 0; c-- {
                        n1.Type = z.Type
                        gins(x86.AMOVB, &z, &n1)
                        n1.Xoffset++
@@ -213,13 +203,13 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node, ax *gc.Node, dx *gc.N
        t := nl.Type
 
        t0 := t
-       check := 0
+       check := false
        if gc.Issigned[t.Etype] {
-               check = 1
+               check = true
                if gc.Isconst(nl, gc.CTINT) && nl.Int() != -1<<uint64(t.Width*8-1) {
-                       check = 0
+                       check = false
                } else if gc.Isconst(nr, gc.CTINT) && nr.Int() != -1 {
-                       check = 0
+                       check = false
                }
        }
 
@@ -229,7 +219,7 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node, ax *gc.Node, dx *gc.N
                } else {
                        t = gc.Types[gc.TUINT32]
                }
-               check = 0
+               check = false
        }
 
        var t1 gc.Node
@@ -278,7 +268,7 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node, ax *gc.Node, dx *gc.N
                gc.Patch(p1, gc.Pc)
        }
 
-       if check != 0 {
+       if check {
                gc.Nodconst(&n4, t, -1)
                gins(optoas(gc.OCMP, t), &n1, &n4)
                p1 := gc.Gbranch(optoas(gc.ONE, t), nil, +1)
@@ -313,7 +303,7 @@ func dodiv(op int, nl *gc.Node, nr *gc.Node, res *gc.Node, ax *gc.Node, dx *gc.N
        } else {
                gmove(dx, res)
        }
-       if check != 0 {
+       if check {
                gc.Patch(p2, gc.Pc)
        }
 }
@@ -513,9 +503,7 @@ func cgen_bmul(op int, nl *gc.Node, nr *gc.Node, res *gc.Node) bool {
 
        // largest ullman on left.
        if nl.Ullman < nr.Ullman {
-               tmp := nl
-               nl = nr
-               nr = tmp
+               nl, nr = nr, nl
        }
 
        var nt gc.Node
@@ -705,9 +693,7 @@ func cgen_floatsse(n *gc.Node, res *gc.Node) {
 
 sbop: // symmetric binary
        if nl.Ullman < nr.Ullman || nl.Op == gc.OLITERAL {
-               r := nl
-               nl = nr
-               nr = r
+               nl, nr = nr, nl
        }
 
 abop: // asymmetric binary