cmd/compile/internal/gc: make SSAGenFPJump a method of SSAGenState

Change-Id: Ie22a08c93dfcfd4b336e7b158415448dd55b2c11
Reviewed-on: https://go-review.googlesource.com/38407
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/cmd/compile/internal/amd64/ssa.go b/src/cmd/compile/internal/amd64/ssa.go
index 40be007cbe0c81c8f72829230268d5fdbc6491ce..df99e9e3e05c22ec43aeb721ac481deb8ba62dfb 100644 (file)
--- a/src/cmd/compile/internal/amd64/ssa.go
+++ b/src/cmd/compile/internal/amd64/ssa.go
@@ -945,10 +945,10 @@ func ssaGenBlock(s *gc.SSAGenState, b, next *ssa.Block) {
                p.To.Sym = b.Aux.(*obj.LSym)
 
        case ssa.BlockAMD64EQF:
-               gc.SSAGenFPJump(s, b, next, &eqfJumps)
+               s.FPJump(b, next, &eqfJumps)
 
        case ssa.BlockAMD64NEF:
-               gc.SSAGenFPJump(s, b, next, &nefJumps)
+               s.FPJump(b, next, &nefJumps)
 
        case ssa.BlockAMD64EQ, ssa.BlockAMD64NE,
                ssa.BlockAMD64LT, ssa.BlockAMD64GE,

diff --git a/src/cmd/compile/internal/gc/ssa.go b/src/cmd/compile/internal/gc/ssa.go
index 5fb6f41c9084ff1bf3c5c7c8874de106d2e978e2..1a37f943d7fa6f452abed080db3b8392eca7d453 100644 (file)
--- a/src/cmd/compile/internal/gc/ssa.go
+++ b/src/cmd/compile/internal/gc/ssa.go
@@ -4438,7 +4438,7 @@ func (s *SSAGenState) oneFPJump(b *ssa.Block, jumps *FloatingEQNEJump, likely ss
        }
 }
 
-func SSAGenFPJump(s *SSAGenState, b, next *ssa.Block, jumps *[2][2]FloatingEQNEJump) {
+func (s *SSAGenState) FPJump(b, next *ssa.Block, jumps *[2][2]FloatingEQNEJump) {
        likely := b.Likely
        switch next {
        case b.Succs[0].Block():

diff --git a/src/cmd/compile/internal/x86/ssa.go b/src/cmd/compile/internal/x86/ssa.go
index 1dfb1ba466a2c2d4e979c3cc9fc4ec655e5b3124..906534b4cfaf98ea730942e9534ac7109026499a 100644 (file)
--- a/src/cmd/compile/internal/x86/ssa.go
+++ b/src/cmd/compile/internal/x86/ssa.go
@@ -807,10 +807,10 @@ func ssaGenBlock(s *gc.SSAGenState, b, next *ssa.Block) {
                p.To.Sym = b.Aux.(*obj.LSym)
 
        case ssa.Block386EQF:
-               gc.SSAGenFPJump(s, b, next, &eqfJumps)
+               s.FPJump(b, next, &eqfJumps)
 
        case ssa.Block386NEF:
-               gc.SSAGenFPJump(s, b, next, &nefJumps)
+               s.FPJump(b, next, &nefJumps)
 
        case ssa.Block386EQ, ssa.Block386NE,
                ssa.Block386LT, ssa.Block386GE,