Graph cleanup

Phis stay with regions, stop sinks to bottom,

2 files changed, 3 insertions, 1 deletions

diff --git a/chapter17/src/main/java/com/seaofnodes/simple/Parser.java b/chapter17/src/main/java/com/seaofnodes/simple/Parser.java
index a8157b41..07312396 100644
--- a/chapter17/src/main/java/com/seaofnodes/simple/Parser.java
+++ b/chapter17/src/main/java/com/seaofnodes/simple/Parser.java
@@ -446,6 +446,7 @@ public class Parser {
         // But first clone the scope and set it as current
         int ndefs = _scope.nIns();
         ScopeNode fScope = _scope.dup(); // Duplicate current scope
+        fScope.ctrl(ifF);       // The pending arm already starts at False
         _xScopes.push(fScope); // For graph visualization we need all scopes
 
         // Parse the true side
@@ -458,7 +459,7 @@ public class Parser {
 
         // Parse the false side
         _scope = fScope;        // Restore scope, then parse else block if any
-        ctrl(ifF.unkeep());     // Ctrl token is now set to ifFalse projection
+        ifF.unkeep();           // fScope already owns the false control
         // Up-cast predicate, even if not else clause, because predicate can
         // remain true if the true clause exits: `if( !ptr ) return 0; return ptr.fld;`
         _scope.addGuards(ifF,pred,true);
diff --git a/chapter17/src/main/java/com/seaofnodes/simple/print/SimpleGraphAdapter.java b/chapter17/src/main/java/com/seaofnodes/simple/print/SimpleGraphAdapter.java
index 5a45aa9d..a88987d5 100644
--- a/chapter17/src/main/java/com/seaofnodes/simple/print/SimpleGraphAdapter.java
+++ b/chapter17/src/main/java/com/seaofnodes/simple/print/SimpleGraphAdapter.java
@@ -38,6 +38,7 @@ public class SimpleGraphAdapter extends GraphAdapter<Node> {
     }
 
     private Kind kind(Node n) {
+        if( n instanceof StopNode ) return Kind.STOP;
         if( n instanceof ScopeNode ) return Kind.SCOPE;
         if( n instanceof StartNode ) return Kind.CTRL;
         if( n instanceof LoopNode ) return Kind.LOOP;