Mercurial > hg > truffle

changeset 22227:68a0c3dcea10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle/Instrumentation: remove extraneous overrides of deprecated Node methods
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Sun, 20 Sep 2015 15:59:09 -0700
parents c896a8e70777
children c9681cd54d90
files truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTestNodes.java truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/InitializationTest.java truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrument.java truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ProbeNode.java truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLExpressionNode.java truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLStatementNode.java truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLExpressionWrapperNode.java truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLStatementWrapperNode.java truffle/com.oracle.truffle.tools.test/src/com/oracle/truffle/tools/test/ToolTestUtil.java
diffstat 9 files changed, 1 insertions(+), 95 deletions(-) [+]
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTestNodes.java	Sun Sep 20 15:51:39 2015 -0700
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTestNodes.java	Sun Sep 20 15:59:09 2015 -0700
@@ -56,17 +56,6 @@
     abstract static class TestLanguageNode extends Node {
         public abstract Object execute(VirtualFrame vFrame);
 
-        @SuppressWarnings("deprecation")
-        @Override
-        public boolean isInstrumentable() {
-            return true;
-        }
-
-        @SuppressWarnings("deprecation")
-        @Override
-        public WrapperNode createWrapperNode() {
-            throw new UnsupportedOperationException();
-        }
     }
 
     @NodeInfo(cost = NodeCost.NONE)
@@ -85,11 +74,6 @@
         }
 
         @Override
-        public boolean isInstrumentable() {
-            return false;
-        }
-
-        @Override
         public void insertEventHandlerNode(EventHandlerNode eventHandler) {
             this.eventHandlerNode = eventHandler;
         }
--- a/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/InitializationTest.java	Sun Sep 20 15:51:39 2015 -0700
+++ b/truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/vm/InitializationTest.java	Sun Sep 20 15:59:09 2015 -0700
@@ -132,22 +132,9 @@
             return getRootNode().getSourceSection();
         }
 
-        @SuppressWarnings("deprecation")
-        @Override
-        public boolean isInstrumentable() {
-            return true;
-        }
-
-        @SuppressWarnings("deprecation")
-        @Override
-        public WrapperNode createWrapperNode() {
-            throw new UnsupportedOperationException();
-        }
-
         Object constant() {
             return constant;
         }
-
     }
 
     private static class ANodeWrapper extends ANode implements WrapperNode {
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrument.java	Sun Sep 20 15:51:39 2015 -0700
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrument.java	Sun Sep 20 15:59:09 2015 -0700
@@ -612,12 +612,6 @@
             this.nextInstrumentNode = nextNode;
         }
 
-        @SuppressWarnings("deprecation")
-        @Override
-        public boolean isInstrumentable() {
-            return false;
-        }
-
         @Override
         public Probe getProbe() {
             return probe;
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ProbeNode.java	Sun Sep 20 15:51:39 2015 -0700
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/ProbeNode.java	Sun Sep 20 15:59:09 2015 -0700
@@ -56,12 +56,6 @@
      */
     @Child protected AbstractInstrumentNode firstInstrumentNode;
 
-    @SuppressWarnings("deprecation")
-    @Override
-    public boolean isInstrumentable() {
-        return false;
-    }
-
     @Override
     public Node copy() {
         Node node = super.copy();
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLExpressionNode.java	Sun Sep 20 15:51:39 2015 -0700
+++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLExpressionNode.java	Sun Sep 20 15:59:09 2015 -0700
@@ -42,7 +42,6 @@
 
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrument.WrapperNode;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.source.SourceSection;
@@ -93,15 +92,4 @@
     public boolean executeBoolean(VirtualFrame frame) throws UnexpectedResultException {
         return SLTypesGen.expectBoolean(executeGeneric(frame));
     }
-
-    @Override
-    public boolean isInstrumentable() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public WrapperNode createWrapperNode() {
-        throw new UnsupportedOperationException();
-    }
-
 }
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLStatementNode.java	Sun Sep 20 15:51:39 2015 -0700
+++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/SLStatementNode.java	Sun Sep 20 15:59:09 2015 -0700
@@ -43,7 +43,6 @@
 import java.io.File;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrument.WrapperNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.source.SourceSection;
@@ -101,17 +100,4 @@
             return String.format("%s:%d%s", sourceName, startLine, estimated ? "~" : "");
         }
     }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public boolean isInstrumentable() {
-        return true;
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public WrapperNode createWrapperNode() {
-        throw new UnsupportedOperationException();
-    }
-
 }
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLExpressionWrapperNode.java	Sun Sep 20 15:51:39 2015 -0700
+++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLExpressionWrapperNode.java	Sun Sep 20 15:59:09 2015 -0700
@@ -81,11 +81,6 @@
     }
 
     @Override
-    public boolean isInstrumentable() {
-        return false;
-    }
-
-    @Override
     public SLExpressionNode getNonWrapperNode() {
         return child;
     }
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLStatementWrapperNode.java	Sun Sep 20 15:51:39 2015 -0700
+++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLStatementWrapperNode.java	Sun Sep 20 15:59:09 2015 -0700
@@ -74,11 +74,6 @@
     }
 
     @Override
-    public boolean isInstrumentable() {
-        return false;
-    }
-
-    @Override
     public SLStatementNode getNonWrapperNode() {
         return child;
     }
--- a/truffle/com.oracle.truffle.tools.test/src/com/oracle/truffle/tools/test/ToolTestUtil.java	Sun Sep 20 15:51:39 2015 -0700
+++ b/truffle/com.oracle.truffle.tools.test/src/com/oracle/truffle/tools/test/ToolTestUtil.java	Sun Sep 20 15:59:09 2015 -0700
@@ -42,10 +42,10 @@
 import com.oracle.truffle.api.instrument.Instrumenter;
 import com.oracle.truffle.api.instrument.KillException;
 import com.oracle.truffle.api.instrument.Probe;
-import com.oracle.truffle.api.instrument.WrapperNode;
 import com.oracle.truffle.api.instrument.SyntaxTag;
 import com.oracle.truffle.api.instrument.ToolSupportProvider;
 import com.oracle.truffle.api.instrument.Visualizer;
+import com.oracle.truffle.api.instrument.WrapperNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeCost;
 import com.oracle.truffle.api.nodes.NodeInfo;
@@ -210,18 +210,6 @@
         protected ToolTestLangNode(SourceSection ss) {
             super(ss);
         }
-
-        @SuppressWarnings("deprecation")
-        @Override
-        public boolean isInstrumentable() {
-            throw new UnsupportedOperationException();
-        }
-
-        @SuppressWarnings("deprecation")
-        @Override
-        public WrapperNode createWrapperNode() {
-            throw new UnsupportedOperationException();
-        }
     }
 
     @NodeInfo(cost = NodeCost.NONE)
@@ -240,11 +228,6 @@
             return "Wrapper node for testing";
         }
 
-        @Override
-        public boolean isInstrumentable() {
-            return false;
-        }
-
         public void insertEventHandlerNode(EventHandlerNode eventHandler) {
             this.eventHandlerNode = eventHandler;
         }