changeset 22245:c1f9d1ea057c

Truffle/Instrumentation: remove an indirection in a call from RootNode to having instrumentation applied.
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Wed, 23 Sep 2015 17:23:57 -0700
parents 3c73d029b651
children bc3be6efa1cc
files truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/Node.java truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java
diffstat 2 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/Node.java	Wed Sep 23 16:54:51 2015 -0700
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/Node.java	Wed Sep 23 17:23:57 2015 -0700
@@ -491,11 +491,6 @@
         return "";
     }
 
-    @SuppressWarnings("static-method")
-    protected final void probeAST(RootNode rootNode) {
-        ACCESSOR.probeAST(rootNode);
-    }
-
     private static final Object GIL = new Object();
 
     private static final ThreadLocal<Integer> IN_ATOMIC_BLOCK = new ThreadLocal<Integer>() {
@@ -519,7 +514,7 @@
         return true;
     }
 
-    private static final class AccessorNodes extends Accessor {
+    static final class AccessorNodes extends Accessor {
         @SuppressWarnings("rawtypes")
         @Override
         protected Class<? extends TruffleLanguage> findLanguage(RootNode n) {
@@ -533,5 +528,5 @@
     }
 
     // registers into Accessor.NODES
-    private static final AccessorNodes ACCESSOR = new AccessorNodes();
+    static final AccessorNodes ACCESSOR = new AccessorNodes();
 }
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java	Wed Sep 23 16:54:51 2015 -0700
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/RootNode.java	Wed Sep 23 17:23:57 2015 -0700
@@ -160,7 +160,7 @@
      * stack) without prior knowledge of the language it has come from.
      *
      * Used for instance to determine the language of a <code>RootNode<code>:
-     * 
+     *
      * <pre>
      * <code>
      * rootNode.getExecutionContext().getLanguageShortName();
@@ -186,7 +186,7 @@
     }
 
     public final void applyInstrumentation() {
-        super.probeAST(this);
+        Node.ACCESSOR.probeAST(this);
     }
 
     /**