Remove -disablePeephole

3 files changed, 2 insertions, 22 deletions

diff --git a/chapter06/src/main/java/com/seaofnodes/simple/node/Node.java b/chapter06/src/main/java/com/seaofnodes/simple/node/Node.java
index b533ae34..6f9ee258 100644
--- a/chapter06/src/main/java/com/seaofnodes/simple/node/Node.java
+++ b/chapter06/src/main/java/com/seaofnodes/simple/node/Node.java
@@ -232,12 +232,6 @@ public abstract class Node {
     // Graph-based optimizations
 
     /**
-     * We allow disabling peephole opt so that we can observe the
-     * full graph, vs the optimized graph.
-     */
-    public static boolean _disablePeephole = false;
-
-    /**
      * Try to peephole at this node and return a better replacement Node if
      * possible.  We compute a {@link Type} and then check and replace:
      * <ul>
@@ -266,9 +260,6 @@ public abstract class Node {
         // Compute initial or improved Type
         Type type = _type = compute();
 
-        if (_disablePeephole)
-            return null;        // Peephole optimizations turned off
-
         // Replace constant computations from non-constants with a constant node
         if (!(this instanceof ConstantNode) && type.isConstant())
             return deadCodeElim(new ConstantNode(type).peephole());
@@ -420,7 +411,7 @@ public abstract class Node {
      * Used to allow repeating tests in the same JVM.  This just resets the
      * Node unique id generator, and is done as part of making a new Parser.
      */
-    public static void reset() { UNIQUE_ID = 1; _disablePeephole=false; }
+    public static void reset() { UNIQUE_ID = 1; }
 
     /**
      * Debugging utility to find a Node by index
diff --git a/chapter06/src/test/java/com/seaofnodes/simple/Chapter02Test.java b/chapter06/src/test/java/com/seaofnodes/simple/Chapter02Test.java
index 47cee096..a6075b75 100644
--- a/chapter06/src/test/java/com/seaofnodes/simple/Chapter02Test.java
+++ b/chapter06/src/test/java/com/seaofnodes/simple/Chapter02Test.java
@@ -11,10 +11,8 @@ public class Chapter02Test {
     @Test
     public void testParseGrammar() {
         Parser parser = new Parser("return 1+2*3+-5;");
-        Node._disablePeephole = true; // disable peephole so we can observe full graph
         StopNode ret = parser.parse();
-        assertEquals("return (1+((2*3)+(-5)));", ret.print());
-        Node._disablePeephole = false;
+        assertEquals("return 2;", ret.print());
     }
 
     @Test
diff --git a/chapter06/src/test/java/com/seaofnodes/simple/Chapter03Test.java b/chapter06/src/test/java/com/seaofnodes/simple/Chapter03Test.java
index 10b67f5f..c3cd43c3 100644
--- a/chapter06/src/test/java/com/seaofnodes/simple/Chapter03Test.java
+++ b/chapter06/src/test/java/com/seaofnodes/simple/Chapter03Test.java
@@ -30,15 +30,6 @@ public class Chapter03Test {
     }
 
     @Test
-    public void testVarScopeNoPeephole() {
-        Parser parser = new Parser("int a=1; int b=2; int c=0; { int b=3; c=a+b; } return c;");
-        Node._disablePeephole = true;
-        StopNode ret = parser.parse();
-        Node._disablePeephole = false;
-        assertEquals("return (1+3);", ret.print());
-    }
-
-    @Test
     public void testVarDist() {
         Parser parser = new Parser("int x0=1; int y0=2; int x1=3; int y1=4; return (x0-x1)*(x0-x1) + (y0-y1)*(y0-y1);");
         StopNode ret = parser.parse();