diff graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultASTPrinter.java @ 21408:32ca2353accf

Truffle/Instrumentation: fix NPE hazard
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Sun, 17 May 2015 20:47:04 -0700
parents 36285949c1d5
children
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultASTPrinter.java	Sun May 17 20:35:31 2015 -0700
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultASTPrinter.java	Sun May 17 20:47:04 2015 -0700
@@ -58,20 +58,18 @@
     }
 
     public String printNodeWithInstrumentation(Node node) {
+        if (node == null) {
+            return "null";
+        }
         final StringBuilder sb = new StringBuilder();
-        if (node == null) {
-            sb.append("null");
-        } else {
-            sb.append(nodeName(node));
-            sb.append("(");
-            if (node instanceof InstrumentationNode) {
-                sb.append(instrumentInfo((InstrumentationNode) node));
-            }
-            sb.append(sourceInfo(node));
-
-            sb.append(NodeUtil.printSyntaxTags(node));
-            sb.append(")");
+        sb.append(nodeName(node));
+        sb.append("(");
+        if (node instanceof InstrumentationNode) {
+            sb.append(instrumentInfo((InstrumentationNode) node));
         }
+        sb.append(sourceInfo(node));
+        sb.append(NodeUtil.printSyntaxTags(node));
+        sb.append(")");
         final Node parent = node.getParent();
         if (parent instanceof WrapperNode) {
             final WrapperNode wrapper = (WrapperNode) parent;