From 3b8ad2977ef3911aed7c681037e4640dca59749b Mon Sep 17 00:00:00 2001 From: Cliff Click Date: Mon, 5 Oct 2026 11:30:22 -0700 Subject: Require matching types to use algebraic identies Fixes some bugs `flit x; return x ^ 0;` should give an error instead of returning the plain `x` --- chapter20/src/main/java/com/seaofnodes/simple/node/AddNode.java | 2 +- chapter20/src/main/java/com/seaofnodes/simple/node/DivNode.java | 2 +- chapter20/src/main/java/com/seaofnodes/simple/node/MinusNode.java | 2 +- chapter20/src/main/java/com/seaofnodes/simple/node/MulNode.java | 2 +- chapter20/src/main/java/com/seaofnodes/simple/node/OrNode.java | 2 +- chapter20/src/main/java/com/seaofnodes/simple/node/SarNode.java | 2 +- chapter20/src/main/java/com/seaofnodes/simple/node/ShlNode.java | 2 +- chapter20/src/main/java/com/seaofnodes/simple/node/ShrNode.java | 2 +- chapter20/src/main/java/com/seaofnodes/simple/node/XorNode.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'chapter20/src') diff --git a/chapter20/src/main/java/com/seaofnodes/simple/node/AddNode.java b/chapter20/src/main/java/com/seaofnodes/simple/node/AddNode.java index 01cb6bb7..0fc3bad6 100644 --- a/chapter20/src/main/java/com/seaofnodes/simple/node/AddNode.java +++ b/chapter20/src/main/java/com/seaofnodes/simple/node/AddNode.java @@ -46,7 +46,7 @@ public class AddNode extends Node { // Add of 0. We do not check for (0+x) because this will already // canonicalize to (x+0) - if( t2 == TypeInteger.ZERO ) + if( t2 == TypeInteger.ZERO && lhs._type instanceof TypeInteger ) return lhs; // Add of same to a multiply by 2 diff --git a/chapter20/src/main/java/com/seaofnodes/simple/node/DivNode.java b/chapter20/src/main/java/com/seaofnodes/simple/node/DivNode.java index f0ee21e1..70631c0a 100644 --- a/chapter20/src/main/java/com/seaofnodes/simple/node/DivNode.java +++ b/chapter20/src/main/java/com/seaofnodes/simple/node/DivNode.java @@ -29,7 +29,7 @@ public class DivNode extends Node { @Override public Node idealize() { // Div of 1. - if( in(2)._type == TypeInteger.TRUE ) + if( in(2)._type == TypeInteger.TRUE && in(1)._type instanceof TypeInteger ) return in(1); return null; } diff --git a/chapter20/src/main/java/com/seaofnodes/simple/node/MinusNode.java b/chapter20/src/main/java/com/seaofnodes/simple/node/MinusNode.java index 20220915..66e26163 100644 --- a/chapter20/src/main/java/com/seaofnodes/simple/node/MinusNode.java +++ b/chapter20/src/main/java/com/seaofnodes/simple/node/MinusNode.java @@ -25,7 +25,7 @@ public class MinusNode extends Node { @Override public Node idealize() { // -(-x) is x - if( in(1) instanceof MinusNode minus ) + if( in(1) instanceof MinusNode minus && addDep(minus.in(1))._type instanceof TypeInteger ) return minus.in(1); return null; diff --git a/chapter20/src/main/java/com/seaofnodes/simple/node/MulNode.java b/chapter20/src/main/java/com/seaofnodes/simple/node/MulNode.java index e9dc6887..ac97725c 100644 --- a/chapter20/src/main/java/com/seaofnodes/simple/node/MulNode.java +++ b/chapter20/src/main/java/com/seaofnodes/simple/node/MulNode.java @@ -43,7 +43,7 @@ public class MulNode extends Node { // Mul of 1. We do not check for (1*x) because this will already // canonicalize to (x*1) long c = i.value(); - if( c==1 ) return lhs; + if( c==1 ) return lhs._type instanceof TypeInteger ? lhs : null; if( c==0 ) return Parser.ZERO; // Mul by a power of 2, +/-1. Bit patterns more complex than this // are unlikely to win on an X86 vs the normal "imul", and so diff --git a/chapter20/src/main/java/com/seaofnodes/simple/node/OrNode.java b/chapter20/src/main/java/com/seaofnodes/simple/node/OrNode.java index 5a87ce09..1cd8bafc 100644 --- a/chapter20/src/main/java/com/seaofnodes/simple/node/OrNode.java +++ b/chapter20/src/main/java/com/seaofnodes/simple/node/OrNode.java @@ -34,7 +34,7 @@ public class OrNode extends LogicalNode { // Or of 0. We do not check for (0|x) because this will already // canonicalize to (x|0) - if( t2.isConstant() && t2 instanceof TypeInteger i && i.value()==0 ) + if( t2.isConstant() && t2 instanceof TypeInteger i && i.value()==0 && lhs._type instanceof TypeInteger ) return lhs; // Move constants to RHS: con*arg becomes arg*con diff --git a/chapter20/src/main/java/com/seaofnodes/simple/node/SarNode.java b/chapter20/src/main/java/com/seaofnodes/simple/node/SarNode.java index 47091fed..d321da42 100644 --- a/chapter20/src/main/java/com/seaofnodes/simple/node/SarNode.java +++ b/chapter20/src/main/java/com/seaofnodes/simple/node/SarNode.java @@ -37,7 +37,7 @@ public class SarNode extends LogicalNode { Type t2 = rhs._type; // Sar of 0. - if( t2.isConstant() && t2 instanceof TypeInteger i && (i.value()&63)==0 ) + if( t2.isConstant() && t2 instanceof TypeInteger i && (i.value()&63)==0 && lhs._type instanceof TypeInteger ) return lhs; // TODO: x >> 3 >> (y ? 1 : 2) ==> x >> (y ? 4 : 5) diff --git a/chapter20/src/main/java/com/seaofnodes/simple/node/ShlNode.java b/chapter20/src/main/java/com/seaofnodes/simple/node/ShlNode.java index 2342e7f5..84c19247 100644 --- a/chapter20/src/main/java/com/seaofnodes/simple/node/ShlNode.java +++ b/chapter20/src/main/java/com/seaofnodes/simple/node/ShlNode.java @@ -33,7 +33,7 @@ public class ShlNode extends LogicalNode { if( rhs._type instanceof TypeInteger shl && shl.isConstant() ) { // Shl of 0. - if( (shl.value()&63)==0 ) + if( (shl.value()&63)==0 && lhs._type instanceof TypeInteger ) return lhs; // (x + c) << i => (x << i) + (c << i) if( lhs instanceof AddNode add && add.addDep(this).in(2)._type instanceof TypeInteger c && c.isConstant() ) { diff --git a/chapter20/src/main/java/com/seaofnodes/simple/node/ShrNode.java b/chapter20/src/main/java/com/seaofnodes/simple/node/ShrNode.java index 926bc993..587e1631 100644 --- a/chapter20/src/main/java/com/seaofnodes/simple/node/ShrNode.java +++ b/chapter20/src/main/java/com/seaofnodes/simple/node/ShrNode.java @@ -33,7 +33,7 @@ public class ShrNode extends LogicalNode { Type t2 = rhs._type; // Shr of 0. - if( t2.isConstant() && t2 instanceof TypeInteger i && (i.value()&63)==0 ) + if( t2.isConstant() && t2 instanceof TypeInteger i && (i.value()&63)==0 && lhs._type instanceof TypeInteger ) return lhs; // TODO: x >>> 3 >>> (y ? 1 : 2) ==> x >>> (y ? 4 : 5) diff --git a/chapter20/src/main/java/com/seaofnodes/simple/node/XorNode.java b/chapter20/src/main/java/com/seaofnodes/simple/node/XorNode.java index ef022a2c..034e352a 100644 --- a/chapter20/src/main/java/com/seaofnodes/simple/node/XorNode.java +++ b/chapter20/src/main/java/com/seaofnodes/simple/node/XorNode.java @@ -33,7 +33,7 @@ public class XorNode extends LogicalNode { // Xor of 0. We do not check for (0^x) because this will already // canonicalize to (x^0) - if( t2.isConstant() && t2 instanceof TypeInteger i && i.value()==0 ) + if( t2.isConstant() && t2 instanceof TypeInteger i && i.value()==0 && lhs._type instanceof TypeInteger ) return lhs; // Move constants to RHS: con*arg becomes arg*con -- cgit v1.2.3