# HG changeset patch # User Doug Simon # Date 1415647385 -3600 # Node ID 75e72d39582038b0447c71db4557263e7e7b89d4 # Parent 58b7133cd0e1510d13161fabdd4e99ffca9461a4 fixed toString() for JavaConstants diff -r 58b7133cd0e1 -r 75e72d395820 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/JavaConstant.java --- 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. diff -r 58b7133cd0e1 -r 75e72d395820 graal/com.oracle.graal.api.meta/src/com/oracle/graal/api/meta/NullConstant.java --- 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"; } diff -r 58b7133cd0e1 -r 75e72d395820 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotCompressedNullConstant.java --- 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"; }