Extend and backport SubNode peephole

1 files changed, 15 insertions, 4 deletions

diff --git a/chapter16/src/main/java/com/seaofnodes/simple/node/SubNode.java b/chapter16/src/main/java/com/seaofnodes/simple/node/SubNode.java
index 9eb30089..a433ca90 100644
--- a/chapter16/src/main/java/com/seaofnodes/simple/node/SubNode.java
+++ b/chapter16/src/main/java/com/seaofnodes/simple/node/SubNode.java
@@ -37,13 +37,24 @@ public class SubNode extends Node {
 
     @Override
     public Node idealize() {
+        Node lhs = in(1);
+        Node rhs = in(2);
+        Type t1 = lhs._type;
+        Type t2 = rhs._type;
+
+        if( t2.isConstant() && t2 instanceof TypeInteger i && i.value()==0 )
+            return lhs;
+
+        if( t1.isConstant() && t1 instanceof TypeInteger i && i.value()==0 )
+            return new MinusNode(rhs);
+
         // x - (-y) is x+y
-        if( in(2) instanceof MinusNode minus )
-            return new AddNode(in(1),minus.in(1));
+        if( rhs instanceof MinusNode minus )
+            return new AddNode(lhs,minus.in(1));
 
         // (-x) - y is -(x+y)
-        if( in(1) instanceof MinusNode minus )
-            return new MinusNode(new AddNode(minus.in(1),in(2)).peephole());
+        if( lhs instanceof MinusNode minus )
+            return new MinusNode(new AddNode(minus.in(1),rhs).peephole());
 
         return null;
     }