cmd/compile: minor cleanup in sinit.go

Passes toolstash -cmp.

Change-Id: Id16009ef3ef1173eafe0f0c578dbf325b61aab3c
Reviewed-on: https://go-review.googlesource.com/20674
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/cmd/compile/internal/gc/sinit.go b/src/cmd/compile/internal/gc/sinit.go
index bd600e08fc99e1ee67468bb07edbfd529dcd6feb..e54f7e1c971625ab56e6c84b84a7f727f72b258f 100644 (file)
--- a/src/cmd/compile/internal/gc/sinit.go
+++ b/src/cmd/compile/internal/gc/sinit.go
@@ -512,28 +512,11 @@ func staticname(t *Type, ctxt int) *Node {
 
 func isliteral(n *Node) bool {
        // Treat nils as zeros rather than literals.
-       if n.Op == OLITERAL {
-               if n.Val().Ctype() != CTNIL {
-                       return true
-               }
-       }
-       return false
+       return n.Op == OLITERAL && n.Val().Ctype() != CTNIL
 }
 
 func simplename(n *Node) bool {
-       if n.Op != ONAME {
-               return false
-       }
-       if !n.Addable {
-               return false
-       }
-       if n.Class&PHEAP != 0 {
-               return false
-       }
-       if n.Class == PPARAMREF {
-               return false
-       }
-       return true
+       return n.Op == ONAME && n.Addable && n.Class&PHEAP == 0 && n.Class != PPARAMREF
 }
 
 func litas(l *Node, r *Node, init *Nodes) {
@@ -1442,22 +1425,11 @@ func gen_as_init(n *Node, reportOnly bool) bool {
        default:
                goto no
 
-       case TBOOL,
-               TINT8,
-               TUINT8,
-               TINT16,
-               TUINT16,
-               TINT32,
-               TUINT32,
-               TINT64,
-               TUINT64,
-               TINT,
-               TUINT,
-               TUINTPTR,
-               TPTR32,
-               TPTR64,
-               TFLOAT32,
-               TFLOAT64:
+       case TBOOL, TINT8, TUINT8, TINT16, TUINT16,
+               TINT32, TUINT32, TINT64, TUINT64,
+               TINT, TUINT, TUINTPTR,
+               TPTR32, TPTR64,
+               TFLOAT32, TFLOAT64:
                if !reportOnly {
                        gdata(&nam, nr, int(nr.Type.Width))
                }