From: Keith Randall <khr@golang.org>
Date: Tue, 14 Jul 2015 06:52:59 +0000 (-0700)
Subject: [dev.ssa] cmd/compile/internal/ssa: ensure Phi ops are scheduled first
X-Git-Tag: go1.7beta1~1623^2^2~388
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4e204b42f5b66ea36f0421098a42addc7c2ba6c7;p=gostls13.git

[dev.ssa] cmd/compile/internal/ssa: ensure Phi ops are scheduled first

Phi ops should always be scheduled first.  They have the semantics
of all happening simultaneously at the start of the block.  The regalloc
phase assumes all the phis will appear first.

Change-Id: I30291e1fa384a0819205218f1d1ec3aef6d538dd
Reviewed-on: https://go-review.googlesource.com/12154
Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>
---

diff --git a/src/cmd/compile/internal/ssa/schedule.go b/src/cmd/compile/internal/ssa/schedule.go
index 60d2cd5460..15e8ace391 100644
--- a/src/cmd/compile/internal/ssa/schedule.go
+++ b/src/cmd/compile/internal/ssa/schedule.go
@@ -54,16 +54,28 @@ func schedule(f *Func) {
 			}
 		}
 
-		// Topologically sort the values in b.
 		order = order[:0]
+
+		// Schedule phis first
 		for _, v := range b.Values {
-			if v == b.Control {
-				continue
-			}
 			if v.Op == OpPhi {
-				// Phis all go first.  We handle phis specially
-				// because they may have self edges "a = phi(a, b, c)"
+				// TODO: what if a phi is also a control op?  It happens for
+				// mem ops all the time, which shouldn't matter.  But for
+				// regular ops we might be violating invariants about where
+				// control ops live.
+				if v == b.Control && !v.Type.IsMemory() {
+					f.Unimplementedf("phi is a control op %s %s", v, b)
+				}
 				order = append(order, v)
+			}
+		}
+
+		// Topologically sort the non-phi values in b.
+		for _, v := range b.Values {
+			if v.Op == OpPhi {
+				continue
+			}
+			if v == b.Control {
 				continue
 			}
 			if state[v.ID] != unmarked {