changeset 18329:75e72d395820

fixed toString() for JavaConstants
author Doug Simon <doug.simon@oracle.com>
date Mon, 10 Nov 2014 20:23:05 +0100
parents 58b7133cd0e1
children fe77c26ccde6
files graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaConstant.java graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/NullConstant.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCompressedNullConstant.java
diffstat 3 files changed, 17 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaConstant.java	Mon Nov 10 20:16:12 2014 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaConstant.java	Mon Nov 10 20:23:05 2014 +0100
@@ -134,14 +134,13 @@
         }
     }
 
-// @Override
-// public String toString() {
-// if (getKind() == Kind.Illegal) {
-// return "illegal";
-// } else {
-// return getKind().getJavaName() + "[" + toValueString() + "]";
-// }
-// }
+    static String toString(JavaConstant constant) {
+        if (constant.getKind() == Kind.Illegal) {
+            return "illegal";
+        } else {
+            return constant.getKind().getJavaName() + "[" + constant.toValueString() + "]";
+        }
+    }
 
     /**
      * Creates a boxed double constant.
--- a/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/NullConstant.java	Mon Nov 10 20:16:12 2014 +0100
+++ b/graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/NullConstant.java	Mon Nov 10 20:23:05 2014 +0100
@@ -74,6 +74,11 @@
     }
 
     @Override
+    public String toString() {
+        return JavaConstant.toString(this);
+    }
+
+    @Override
     public String toValueString() {
         return "null";
     }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCompressedNullConstant.java	Mon Nov 10 20:16:12 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCompressedNullConstant.java	Mon Nov 10 20:23:05 2014 +0100
@@ -78,6 +78,11 @@
     }
 
     @Override
+    public String toString() {
+        return JavaConstant.toString(this);
+    }
+
+    @Override
     public String toValueString() {
         return "null";
     }