From 4c8baa0ad0f709b857710d34e662f168c16c533f Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Sat, 3 Sep 2016 18:32:51 -0700 Subject: [PATCH] cmd/compile: use CheckLoweredPhi on PPC64 This custom version is identical to CheckLoweredPhi. The addition of CheckLoweredPhi likely raced with adding PPC64. Change-Id: I294dcb758d312e93fb8842f4d1e12bf0f63a1e06 Reviewed-on: https://go-review.googlesource.com/28479 Run-TryBot: Michael Pratt Reviewed-by: Josh Bleecher Snyder TryBot-Result: Gobot Gobot --- src/cmd/compile/internal/ppc64/ssa.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/cmd/compile/internal/ppc64/ssa.go b/src/cmd/compile/internal/ppc64/ssa.go index 1d81d39b30..78047269d3 100644 --- a/src/cmd/compile/internal/ppc64/ssa.go +++ b/src/cmd/compile/internal/ppc64/ssa.go @@ -854,17 +854,7 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) { gc.Gvarlive(n) case ssa.OpPhi: - // just check to make sure regalloc and stackalloc did it right - if v.Type.IsMemory() { - return - } - f := v.Block.Func - loc := f.RegAlloc[v.ID] - for _, a := range v.Args { - if aloc := f.RegAlloc[a.ID]; aloc != loc { // TODO: .Equal() instead? - v.Fatalf("phi arg at different location than phi: %v @ %v, but arg %v @ %v\n%s\n", v, loc, a, aloc, v.Block.Func) - } - } + gc.CheckLoweredPhi(v) case ssa.OpPPC64LoweredNilCheck: // Optimization - if the subsequent block has a load or store -- 2.48.1