Mercurial > hg > truffle

changeset 22465:ff5c0b5677cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle/Instrumentation: make the language object visualizer more robust when given null.
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Wed, 18 Nov 2015 18:42:18 -0800
parents 73cf3aefeffe
children 57afe7055486
files truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultVisualizer.java truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLDefaultVisualizer.java
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultVisualizer.java	Tue Nov 17 19:43:25 2015 -0800
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/impl/DefaultVisualizer.java	Wed Nov 18 18:42:18 2015 -0800
@@ -76,6 +76,9 @@
     }
 
     public String displayValue(Object value, int trim) {
+        if (value == null) {
+            return "<empty>";
+        }
         return trim(value.toString(), trim);
     }
 
--- a/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLDefaultVisualizer.java	Tue Nov 17 19:43:25 2015 -0800
+++ b/truffle/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/instrument/SLDefaultVisualizer.java	Wed Nov 18 18:42:18 2015 -0800
@@ -94,7 +94,10 @@
 
     @Override
     public String displayValue(Object value, int trim) {
-        if (value == null || value == SLNull.SINGLETON) {
+        if (value == null) {
+            return "<empty>";
+        }
+        if (value == SLNull.SINGLETON) {
             return "null";
         }
         return trim(value.toString(), trim);