Mercurial > hg > truffle

changeset 19039:6f1afa58a9b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle/SL: clean up SL instrumentation code
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Thu, 29 Jan 2015 11:45:56 -0800
parents c7e57dffc5ad
children a143c9cafe16
files graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLStandardASTProber.java
diffstat 1 files changed, 15 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLStandardASTProber.java	Thu Jan 29 11:44:14 2015 -0800
+++ b/graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLStandardASTProber.java	Thu Jan 29 11:45:56 2015 -0800
@@ -44,36 +44,22 @@
      */
     public boolean visit(Node node) {
 
-        if (node.isInstrumentable()) {
-
-            if (node instanceof SLStatementNode) {
-
-                // Distinguish between SLExpressionNode and SLStatementNode since some of the
-                // generated factory methods that require SLExpressionNodes as parameters.
-                // Since
-                // SLExpressionNodes are a subclass of SLStatementNode, check if something is an
-                // SLExpressionNode first.
-                if (node instanceof SLExpressionNode && node.getParent() != null) {
-                    SLExpressionNode expressionNode = (SLExpressionNode) node;
-                    if (expressionNode.getSourceSection() != null) {
-                        Probe probe = expressionNode.probe();
+        if (node instanceof SLStatementNode && node.getParent() != null && node.getSourceSection() != null) {
+            // All SL nodes are instrumentable, but treat expressions specially
 
-                        if (node instanceof SLWriteLocalVariableNode) {
-                            probe.tagAs(STATEMENT, null);
-                            probe.tagAs(ASSIGNMENT, null);
-                        }
-                    }
-                } else if (node instanceof SLStatementNode && node.getParent() != null) {
-
-                    SLStatementNode statementNode = (SLStatementNode) node;
-                    if (statementNode.getSourceSection() != null) {
-                        Probe probe = statementNode.probe();
-                        probe.tagAs(STATEMENT, null);
-
-                        if (node instanceof SLWhileNode) {
-                            probe.tagAs(START_LOOP, null);
-                        }
-                    }
+            if (node instanceof SLExpressionNode) {
+                SLExpressionNode expressionNode = (SLExpressionNode) node;
+                Probe probe = expressionNode.probe();
+                if (node instanceof SLWriteLocalVariableNode) {
+                    probe.tagAs(STATEMENT, null);
+                    probe.tagAs(ASSIGNMENT, null);
+                }
+            } else {
+                SLStatementNode statementNode = (SLStatementNode) node;
+                Probe probe = statementNode.probe();
+                probe.tagAs(STATEMENT, null);
+                if (node instanceof SLWhileNode) {
+                    probe.tagAs(START_LOOP, null);
                 }
             }
         }