Mercurial > hg > truffle

changeset 21300:07c22c0ab91e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle/Instrumentation: clean up minor issues in the new "ToolEval" instrument kind.
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Mon, 11 May 2015 18:43:12 -0700
parents 8eadc82f4a93
children 31dcb86ad3a6
files graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrument.java
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrument.java	Mon May 11 17:27:08 2015 -0700
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Instrument.java	Mon May 11 18:43:12 2015 -0700
@@ -420,7 +420,7 @@
         @NodeInfo(cost = NodeCost.NONE)
         private final class ToolEvalNodeInstrumentNode extends AbstractInstrumentNode {
 
-            @Child ToolEvalNode toolEvalNode;
+            @Child private ToolEvalNode toolEvalNode;
 
             private ToolEvalNodeInstrumentNode(AbstractInstrumentNode nextNode) {
                 super(nextNode);
@@ -428,6 +428,7 @@
 
             public void enter(Node node, VirtualFrame vFrame) {
                 if (toolEvalNode == null) {
+                    CompilerDirectives.transferToInterpreter();
                     final ToolEvalNode newToolEvalNodeNode = ToolEvalInstrument.this.toolEvalNodeFactory.createToolEvalNode(ToolEvalInstrument.this.probe, node);
                     if (newToolEvalNodeNode != null) {
                         toolEvalNode = newToolEvalNodeNode;