From: Matthew Dempsky Date: Wed, 22 Mar 2017 17:27:30 +0000 (-0700) Subject: cmd/compile/internal/gc: make SSAGenFPJump a method of SSAGenState X-Git-Tag: go1.9beta1~1038 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=22ea7fc1a9d3af3b09c823b60f7b7cc81cea4f48;p=gostls13.git 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 Reviewed-by: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- diff --git a/src/cmd/compile/internal/amd64/ssa.go b/src/cmd/compile/internal/amd64/ssa.go index 40be007cbe..df99e9e3e0 100644 --- 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 5fb6f41c90..1a37f943d7 100644 --- 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 1dfb1ba466..906534b4cf 100644 --- 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,