cmd/compile: code cleanup

Change-Id: Ibf68e663f29a5cb3b64a7d923c005c16da647769
Reviewed-on: https://go-review.googlesource.com/c/go/+/266537
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Go Bot <gobot@golang.org>

diff --git a/src/cmd/compile/internal/amd64/ssa.go b/src/cmd/compile/internal/amd64/ssa.go
index f30a47b903745579115d2423a15c53a85c4753a6..76e33a3689916c80fd5211d81495c731ca6fed2c 100644 (file)
--- a/src/cmd/compile/internal/amd64/ssa.go
+++ b/src/cmd/compile/internal/amd64/ssa.go
@@ -42,10 +42,11 @@ func ssaMarkMoves(s *gc.SSAGenState, b *ssa.Block) {
 // loadByType returns the load instruction of the given type.
 func loadByType(t *types.Type) obj.As {
        // Avoid partial register write
-       if !t.IsFloat() && t.Size() <= 2 {
-               if t.Size() == 1 {
+       if !t.IsFloat() {
+               switch t.Size() {
+               case 1:
                        return x86.AMOVBLZX
-               } else {
+               case 2:
                        return x86.AMOVWLZX
                }
        }
@@ -1070,7 +1071,7 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) {
                p := s.Prog(v.Op.Asm())
                val := v.AuxInt
                // 0 means math.RoundToEven, 1 Floor, 2 Ceil, 3 Trunc
-               if val != 0 && val != 1 && val != 2 && val != 3 {
+               if val < 0 || val > 3 {
                        v.Fatalf("Invalid rounding mode")
                }
                p.From.Offset = val

diff --git a/src/cmd/compile/internal/ssa/compile.go b/src/cmd/compile/internal/ssa/compile.go
index 9ddc53060ce3e3ed0348e99b7abeb34340ed0882..63994d1778ed029a9d59f8042db4af96837c2ac0 100644 (file)
--- a/src/cmd/compile/internal/ssa/compile.go
+++ b/src/cmd/compile/internal/ssa/compile.go
@@ -304,37 +304,39 @@ commas. For example:
 `
        }
 
-       if phase == "check" && flag == "on" {
-               checkEnabled = val != 0
-               debugPoset = checkEnabled // also turn on advanced self-checking in prove's datastructure
-               return ""
-       }
-       if phase == "check" && flag == "off" {
-               checkEnabled = val == 0
-               debugPoset = checkEnabled
-               return ""
-       }
-       if phase == "check" && flag == "seed" {
-               checkEnabled = true
-               checkRandSeed = val
-               debugPoset = checkEnabled
-               return ""
+       if phase == "check" {
+               switch flag {
+               case "on":
+                       checkEnabled = val != 0
+                       debugPoset = checkEnabled // also turn on advanced self-checking in prove's datastructure
+                       return ""
+               case "off":
+                       checkEnabled = val == 0
+                       debugPoset = checkEnabled
+                       return ""
+               case "seed":
+                       checkEnabled = true
+                       checkRandSeed = val
+                       debugPoset = checkEnabled
+                       return ""
+               }
        }
 
        alltime := false
        allmem := false
        alldump := false
        if phase == "all" {
-               if flag == "time" {
+               switch flag {
+               case "time":
                        alltime = val != 0
-               } else if flag == "mem" {
+               case "mem":
                        allmem = val != 0
-               } else if flag == "dump" {
+               case "dump":
                        alldump = val != 0
                        if alldump {
                                BuildDump = valString
                        }
-               } else {
+               default:
                        return fmt.Sprintf("Did not find a flag matching %s in -d=ssa/%s debug option", flag, phase)
                }
        }

diff --git a/src/cmd/compile/internal/x86/ssa.go b/src/cmd/compile/internal/x86/ssa.go
index 74a4570770c881a31d466347056a10a757868177..fbf76d0c5efb979e37dab6666008708b26a36fcb 100644 (file)
--- a/src/cmd/compile/internal/x86/ssa.go
+++ b/src/cmd/compile/internal/x86/ssa.go
@@ -42,10 +42,11 @@ func ssaMarkMoves(s *gc.SSAGenState, b *ssa.Block) {
 // loadByType returns the load instruction of the given type.
 func loadByType(t *types.Type) obj.As {
        // Avoid partial register write
-       if !t.IsFloat() && t.Size() <= 2 {
-               if t.Size() == 1 {
+       if !t.IsFloat() {
+               switch t.Size() {
+               case 1:
                        return x86.AMOVBLZX
-               } else {
+               case 2:
                        return x86.AMOVWLZX
                }
        }