Unify mixed-return checking and results

Unify dominator caching.

14 files changed, 90 insertions, 48 deletions

diff --git a/chapter21/src/main/java/com/seaofnodes/simple/codegen/CodeGen.java b/chapter21/src/main/java/com/seaofnodes/simple/codegen/CodeGen.java
index 9ec3bc7b..029e149b 100644
--- a/chapter21/src/main/java/com/seaofnodes/simple/codegen/CodeGen.java
+++ b/chapter21/src/main/java/com/seaofnodes/simple/codegen/CodeGen.java
@@ -87,22 +87,12 @@ public class CodeGen {
     public  int getALIAS() { return _alias++; }
 
 
-    // idepths are cached and valid until *inserting* CFG edges (deleting is
-    // OK).  This happens with inlining, which bumps the version to bulk
-    // invalidate the idepth caches.
-    private int _iDepthVersion = 0;
-    public void invalidateIDepthCaches() { _iDepthVersion++; }
-    public boolean validIDepth(int idepth) {
-        if( idepth==0 ) return false;
-        if( _iDepthVersion==0 ) return true;
-        return (idepth%100)==_iDepthVersion;
-    }
-    public int iDepthAt(int idepth) {
-        return 100*idepth+_iDepthVersion;
-    }
-    public int iDepthFrom(int idepth) {
-        assert idepth==0 || validIDepth(idepth);
-        return idepth+100;
+    // Inlining can insert CFG edges and invalidate cached depth ordering.
+    private char _iDepthVersion;
+    public char iDepthVersion() { return _iDepthVersion; }
+    public void invalidateIDepthCaches() {
+        assert _iDepthVersion < Character.MAX_VALUE : "Dominator cache version exceeds 65535";
+        ++_iDepthVersion;
     }
 
     // Popular visit bitset, declared here, so it gets reused all over
diff --git a/chapter21/src/main/java/com/seaofnodes/simple/codegen/GlobalCodeMotion.java b/chapter21/src/main/java/com/seaofnodes/simple/codegen/GlobalCodeMotion.java
index 40f827ec..da045925 100644
--- a/chapter21/src/main/java/com/seaofnodes/simple/codegen/GlobalCodeMotion.java
+++ b/chapter21/src/main/java/com/seaofnodes/simple/codegen/GlobalCodeMotion.java
@@ -196,7 +196,7 @@ public abstract class GlobalCodeMotion {
         CFGNode lca = null;
         for( Node use : n._outputs )
             if( use != null )
-              lca = use_block(n,use, late)._idom(lca,null);
+              lca = use_block(n,use, late).domLCA(lca,null);
 
         // Loads may need anti-dependencies, raising their LCA
         if( n instanceof MemOpNode load && load._isLoad )
@@ -250,7 +250,7 @@ public abstract class GlobalCodeMotion {
         CFGNode found=null;
         for( int i=1; i<phi.nIns(); i++ )
             if( phi.in(i)==n )
-                found = phi.region().cfg(i)._idom(found,null);
+                found = phi.region().cfg(i).domLCA(found,null);
 
         assert found!=null;
         return found;
@@ -304,7 +304,7 @@ public abstract class GlobalCodeMotion {
     private static CFGNode anti_dep( MemOpNode load, CFGNode stblk, CFGNode defblk, CFGNode lca, Node st ) {
         // Store and Load overlap, need anti-dependence
         if( stblk._anti==load._nid ) {
-            lca = stblk._idom(lca,null); // Raise Loads LCA
+            lca = stblk.domLCA(lca,null); // Raise Loads LCA
             if( lca == stblk && st != null && st._inputs.find(load) == -1 ) // And if something moved,
                 st.addDef(load); // Add anti-dep as well
             return lca;          // Cap this stores' anti-dep to here
diff --git a/chapter21/src/main/java/com/seaofnodes/simple/node/CFGNode.java b/chapter21/src/main/java/com/seaofnodes/simple/node/CFGNode.java
index 7877f93a..6f533ae0 100644
--- a/chapter21/src/main/java/com/seaofnodes/simple/node/CFGNode.java
+++ b/chapter21/src/main/java/com/seaofnodes/simple/node/CFGNode.java
@@ -36,6 +36,7 @@ public abstract class CFGNode extends Node {
         super(cfg);
         if( cfg != null ) {
             _idepth = cfg._idepth;
+            _idepthVersion = cfg._idepthVersion;
             _ltree = cfg._ltree;
             _pre = cfg._pre;
         }
@@ -72,21 +73,30 @@ public abstract class CFGNode extends Node {
      * <p>
      * See {@link <a href="https://en.wikipedia.org/wiki/Dominator_(graph_theory)">...</a>}
      */
-    public int _idepth;
-    public int idepth() {
-        return CodeGen.CODE.validIDepth(_idepth) ? _idepth : (_idepth=CodeGen.CODE.iDepthFrom(idom().idepth()));
+    public char _idepth;
+    public char _idepthVersion;
+    public int idepth() { return validIDepth() ? _idepth : cacheIDepth(idom().idepth()+1); }
+    // Zero depth means uncached. Check before narrowing so overflow cannot wrap.
+    final int cacheIDepth(int depth) {
+        assert 0 <= depth && depth <= Character.MAX_VALUE : "Dominator depth exceeds 65535";
+        _idepthVersion = CodeGen.CODE.iDepthVersion();
+        return _idepth = (char)depth;
     }
 
+    final boolean validIDepth() { return _idepth!=0 && _idepthVersion==CodeGen.CODE.iDepthVersion(); }
+
+
     // Return the immediate dominator of this Node and compute dom tree depth.
     public CFGNode idom(Node dep) { return cfg(0); }
     public final CFGNode idom() { return idom(null); }
 
     // Return the LCA of two idoms
-    public CFGNode _idom(CFGNode rhs, Node dep) {
+    public CFGNode domLCA(CFGNode rhs, Node dep) {
         if( rhs==null ) return this;
         CFGNode lhs = this;
         while( lhs != rhs ) {
-            var comp = lhs.idepth() - rhs.idepth();
+            if( lhs==null || rhs==null ) return null;
+            int comp = lhs.idepth() - rhs.idepth();
             if( comp >= 0 ) lhs = (dep==null ? lhs : dep.addDep(lhs)).idom();
             if( comp <= 0 ) rhs = (dep==null ? rhs : dep.addDep(rhs)).idom();
         }
diff --git a/chapter21/src/main/java/com/seaofnodes/simple/node/FunNode.java b/chapter21/src/main/java/com/seaofnodes/simple/node/FunNode.java
index b41a7e54..384547fa 100644
--- a/chapter21/src/main/java/com/seaofnodes/simple/node/FunNode.java
+++ b/chapter21/src/main/java/com/seaofnodes/simple/node/FunNode.java
@@ -114,9 +114,7 @@ public class FunNode extends RegionNode {
 
     // Bypass Region idom, always assume depth == 1, one more than Start,
     // unless folding then just a ID on input#1
-    @Override public int idepth() {
-        return _folding ? super.idepth() : CodeGen.CODE.iDepthAt(1);
-    }
+    @Override public int idepth() { return _folding ? super.idepth() : 1; }
     // Bypass Region idom, always assume idom is Start
     @Override public CFGNode idom(Node dep) { return cfg(1); }
 
diff --git a/chapter21/src/main/java/com/seaofnodes/simple/node/LoadNode.java b/chapter21/src/main/java/com/seaofnodes/simple/node/LoadNode.java
index 6147de81..785ba62c 100644
--- a/chapter21/src/main/java/com/seaofnodes/simple/node/LoadNode.java
+++ b/chapter21/src/main/java/com/seaofnodes/simple/node/LoadNode.java
@@ -65,7 +65,7 @@ public class LoadNode extends MemOpNode {
         for( Node memuse : mem._outputs )
             // Find a prior load, has same mem,ptr,off but higher ctrl
             if( memuse != this && memuse instanceof LoadNode ld && ptr==ld.ptr() && off()==ld.off() &&
-                cfg0()!=null && cfg0()._idom(ld.cfg0(),this) == ld.cfg0() ) // Higher control means load is legal earlier
+                cfg0()!=null && cfg0().domLCA(ld.cfg0(),this) == ld.cfg0() ) // Higher control means load is legal earlier
                 return ld;
 
         // Load-after-Store on same address, but bypassing provably unrelated
diff --git a/chapter21/src/main/java/com/seaofnodes/simple/node/LoopNode.java b/chapter21/src/main/java/com/seaofnodes/simple/node/LoopNode.java
index 2fa070bc..3d69b94d 100644
--- a/chapter21/src/main/java/com/seaofnodes/simple/node/LoopNode.java
+++ b/chapter21/src/main/java/com/seaofnodes/simple/node/LoopNode.java
@@ -26,9 +26,7 @@ public class LoopNode extends RegionNode {
     }
 
     // Bypass Region idom, same as the default idom() using use in(1) instead of in(0)
-    public int idepth() {
-        return CodeGen.CODE.validIDepth(_idepth) ? _idepth : (_idepth=CodeGen.CODE.iDepthFrom(idom().idepth()));
-    }
+    public int idepth() { return validIDepth() ? _idepth : cacheIDepth(entry().idepth()+1); }
     // Bypass Region idom, same as the default idom() using use in(1) instead of in(0)
     @Override public CFGNode idom(Node dep) { return entry(); }
 
diff --git a/chapter21/src/main/java/com/seaofnodes/simple/node/RegionNode.java b/chapter21/src/main/java/com/seaofnodes/simple/node/RegionNode.java
index 8f65d0e5..64747c63 100644
--- a/chapter21/src/main/java/com/seaofnodes/simple/node/RegionNode.java
+++ b/chapter21/src/main/java/com/seaofnodes/simple/node/RegionNode.java
@@ -141,21 +141,19 @@ public class RegionNode extends CFGNode {
 
     // Immediate dominator of Region is a little more complicated.
     @Override public int idepth() {
-        if( CodeGen.CODE.validIDepth(_idepth) )
-            return _idepth;
-        int d=0;
+        if( validIDepth() ) return _idepth;
+        int depth=0;
         for( Node n : _inputs )
             if( n!=null )
-                d = Math.max(d,CodeGen.CODE.iDepthFrom(((CFGNode)n).idepth()));
-        return _idepth = d;
+                depth = Math.max(depth,((CFGNode)n).idepth()+1);
+        return cacheIDepth(depth);
     }
 
     @Override public CFGNode idom(Node dep) {
         CFGNode lca = null;
-        // Walk the LHS & RHS idom trees in parallel until they match, or either fails.
-        // Because this does not cache, it can be linear in the size of the program.
+        // Recompute from predecessors: CFG edits can change the dominator.
         for( int i=1; i<nIns(); i++ )
-            lca = cfg(i)._idom(lca,dep);
+            lca = cfg(i).domLCA(lca,dep);
         return lca;
     }
 
diff --git a/chapter21/src/main/java/com/seaofnodes/simple/node/ReturnNode.java b/chapter21/src/main/java/com/seaofnodes/simple/node/ReturnNode.java
index 317f4ce8..929deefd 100644
--- a/chapter21/src/main/java/com/seaofnodes/simple/node/ReturnNode.java
+++ b/chapter21/src/main/java/com/seaofnodes/simple/node/ReturnNode.java
@@ -82,8 +82,7 @@ public class ReturnNode extends CFGNode {
         return ctrl().getClass() == RegionNode.class && ((RegionNode)ctrl()).inProgress();
     }
 
-    // Gather parse-time return types for error reporting
-    private Type mt = Type.TOP;
+    // Remember parsed type kinds for diagnostics; the optimized expression decides validity.
     private boolean ti=false, tf=false, tp=false, tn=false;
 
     // Add a return exit to the current parsing function
@@ -92,7 +91,6 @@ public class ReturnNode extends CFGNode {
 
         // Gather parse-time return types for error reporting
         Type t = expr._type;
-        mt = mt.meet(t);
         ti |= t instanceof TypeInteger x;
         tf |= t instanceof TypeFloat   x;
         tp |= t instanceof TypeMemPtr  x;
@@ -118,7 +116,7 @@ public class ReturnNode extends CFGNode {
     }
 
     @Override public Parser.ParseException err() {
-        return expr()._type/*mt*/==Type.BOTTOM ? mixerr(ti,tf,tp,tn,_fun._loc) : null;
+        return expr()._type==Type.BOTTOM ? mixerr(ti,tf,tp,tn,_fun._loc) : null;
     }
 
     static Parser.ParseException mixerr( boolean ti, boolean tf, boolean tp, boolean tn, Parser.Lexer loc ) {
diff --git a/chapter21/src/main/java/com/seaofnodes/simple/node/StartNode.java b/chapter21/src/main/java/com/seaofnodes/simple/node/StartNode.java
index f40203b4..4bd76f50 100644
--- a/chapter21/src/main/java/com/seaofnodes/simple/node/StartNode.java
+++ b/chapter21/src/main/java/com/seaofnodes/simple/node/StartNode.java
@@ -51,7 +51,7 @@ public class StartNode extends LoopNode implements MultiNode {
     @Override public Node idealize() { return null; }
 
     // No immediate dominator, and idepth==0
-    @Override public int idepth() { return CodeGen.CODE.iDepthAt(0); }
+    @Override public int idepth() { return 0; }
     @Override public CFGNode idom(Node dep) { return null; }
 
 }
diff --git a/chapter21/src/main/java/com/seaofnodes/simple/node/StopNode.java b/chapter21/src/main/java/com/seaofnodes/simple/node/StopNode.java
index 9be08ad9..d381e716 100644
--- a/chapter21/src/main/java/com/seaofnodes/simple/node/StopNode.java
+++ b/chapter21/src/main/java/com/seaofnodes/simple/node/StopNode.java
@@ -56,10 +56,10 @@ public class StopNode extends CFGNode {
     }
 
     @Override public int idepth() {
-        if( _idepth!=0 ) return _idepth;
+        if( validIDepth() ) return _idepth;
         int d=0;
         for( Node ret : _inputs )
             d = Math.max(d,((ReturnNode)ret).idepth()+1);
-        return _idepth=d;
+        return cacheIDepth(d);
     }
 }
diff --git a/chapter21/src/test/java/com/seaofnodes/simple/Chapter10Test.java b/chapter21/src/test/java/com/seaofnodes/simple/Chapter10Test.java
index e2cbf331..58ca9f5a 100644
--- a/chapter21/src/test/java/com/seaofnodes/simple/Chapter10Test.java
+++ b/chapter21/src/test/java/com/seaofnodes/simple/Chapter10Test.java
@@ -6,6 +6,19 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 public class Chapter10Test {
+    @Test public void testDeadReferenceReturn() {
+        for( String body : new String[] {
+            "return new S; return 0;",
+            "if(1) return new S; else return 0;"
+        } ) {
+            String src = "struct S { int x; }; " + body;
+            var code = new CodeGen(src).parse().opto().typeCheck();
+            org.junit.Assert.assertTrue(body,
+                code.expr()._type instanceof com.seaofnodes.simple.type.TypeMemPtr);
+        }
+    }
+
+
 
     // Issue #246: null-check guards start in Chapter 10; arrays arrive in Chapter 15.
     private static final String NULLABLE_POINT_SOURCE = """
diff --git a/chapter21/src/test/java/com/seaofnodes/simple/Chapter12Test.java b/chapter21/src/test/java/com/seaofnodes/simple/Chapter12Test.java
index 8069ddaa..21759b78 100644
--- a/chapter21/src/test/java/com/seaofnodes/simple/Chapter12Test.java
+++ b/chapter21/src/test/java/com/seaofnodes/simple/Chapter12Test.java
@@ -7,6 +7,20 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 public class Chapter12Test {
+    @Test public void testDeadNumericReturns() {
+        for( String[] test : new String[][] {
+            {"if(1) return 7; else return 2.5;", "7"},
+            {"if(0) return 7; else return 2.5;", "2.5"},
+            {"return 7; return 2.5;", "7"},
+            {"return 2.5; return 7;", "2.5"}
+        } ) {
+            String src = test[0];
+            var code = new CodeGen(src).parse().opto().typeCheck();
+            assertEquals(src,test[1],Eval2.eval(code,0));
+        }
+    }
+
+
     @Test
     public void testJig() {
         CodeGen code = new CodeGen(
diff --git a/chapter21/src/test/java/com/seaofnodes/simple/Chapter18Test.java b/chapter21/src/test/java/com/seaofnodes/simple/Chapter18Test.java
index b4f6c6ba..d5d5c2ef 100644
--- a/chapter21/src/test/java/com/seaofnodes/simple/Chapter18Test.java
+++ b/chapter21/src/test/java/com/seaofnodes/simple/Chapter18Test.java
@@ -11,6 +11,22 @@ import static org.junit.Assert.*;
 import static org.junit.Assert.fail;
 
 public class Chapter18Test {
+    @Test public void testReachableMixedReturns() {
+        for( String[] test : new String[][] {
+            {"if(arg) return 7; else return 2.5;", "No common type amongst int and f64"},
+            {"struct S { int x; }; if(arg) return new S; else return 0;",
+             "No common type amongst int and reference"}
+        } ) {
+            try {
+                new CodeGen(test[0]).parse().opto().typeCheck();
+                fail("Expected incompatible return types: " + test[0]);
+            } catch( Parser.ParseException e ) {
+                assertEquals(test[1],e.getMessage());
+            }
+        }
+    }
+
+
     @Test public void testPrintingForwardReferenceScope() throws Exception {
         new CodeGen("return 0;").parse();
         var declared = TypeMemPtr.make(TypeStruct.makeFRef("PrintForward"));
diff --git a/chapter21/src/test/java/com/seaofnodes/simple/node/PrintTestSupport.java b/chapter21/src/test/java/com/seaofnodes/simple/node/PrintTestSupport.java
index 01d471bf..ceea1de5 100644
--- a/chapter21/src/test/java/com/seaofnodes/simple/node/PrintTestSupport.java
+++ b/chapter21/src/test/java/com/seaofnodes/simple/node/PrintTestSupport.java
@@ -21,17 +21,24 @@ public class PrintTestSupport {
         var ins = new IdentityHashMap<Node,Node[]>();
         var outs = new IdentityHashMap<Node,Node[]>();
         var hashes = new IdentityHashMap<Node,Integer>();
+        var versions = new IdentityHashMap<Node,Integer>();
         var depths = new IdentityHashMap<Node,Integer>();
         for( Node n : nodes ) {
             ins.put(n,n._inputs.toArray(new Node[0]));
             outs.put(n,n._outputs.toArray(new Node[0]));
             hashes.put(n,hash.getInt(n));
-            if( n instanceof CFGNode cfg ) depths.put(n,cfg._idepth);
+            if( n instanceof CFGNode cfg ) {
+                depths.put(n,(int)cfg._idepth);
+                versions.put(n,(int)cfg._idepthVersion);
+            }
         }
         print.run();
         for( Node n : nodes ) {
             assertEquals("hash of node "+n._nid,(int)hashes.get(n),hash.getInt(n));
-            if( n instanceof CFGNode cfg ) assertEquals("depth of node "+n._nid,(int)depths.get(n),cfg._idepth);
+            if( n instanceof CFGNode cfg ) {
+                assertEquals("depth of node "+n._nid,(int)depths.get(n),cfg._idepth);
+                assertEquals("depth version of node "+n._nid,(int)versions.get(n),cfg._idepthVersion);
+            }
             assertEquals(ins.get(n).length,n.nIns());
             assertEquals(outs.get(n).length,n.nOuts());
             for( int i=0; i<n.nIns(); i++ ) assertSame(ins.get(n)[i],n.in(i));