# HG changeset patch # User Doug Simon # Date 1415276793 -3600 # Node ID b2eb7302706c5919866708c71c6c67ef2d7ceb19 # Parent ecf3de366ecc2726a9e8acc49044f24123bca705 added HotSpotObjectConstant.getNodeClass() diff -r ecf3de366ecc -r b2eb7302706c graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstant.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstant.java Thu Nov 06 13:24:16 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstant.java Thu Nov 06 13:26:33 2014 +0100 @@ -23,6 +23,7 @@ package com.oracle.graal.hotspot.meta; import com.oracle.graal.api.meta.*; +import com.oracle.graal.graph.*; /** * Represents a constant non-{@code null} object reference, within the compiler and across the @@ -49,4 +50,12 @@ */ @PureFunction int getIdentityHashCode(); + + /** + * Gets the result of {@link NodeClass#get(Class)} for the {@link Class} object represented by + * this constant. + * + * @return {@code null} if this constant does not represent a {@link Class} object + */ + JavaConstant getNodeClass(); } diff -r ecf3de366ecc -r b2eb7302706c graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstantImpl.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstantImpl.java Thu Nov 06 13:24:16 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotObjectConstantImpl.java Thu Nov 06 13:26:33 2014 +0100 @@ -23,6 +23,7 @@ package com.oracle.graal.hotspot.meta; import com.oracle.graal.api.meta.*; +import com.oracle.graal.graph.*; /** * Represents a constant non-{@code null} object reference, within the compiler and across the @@ -109,6 +110,13 @@ return System.identityHashCode(object); } + public JavaConstant getNodeClass() { + if (object instanceof Class) { + return HotSpotObjectConstantImpl.forObject(NodeClass.get((Class) object)); + } + return null; + } + @Override public boolean isNull() { return false; diff -r ecf3de366ecc -r b2eb7302706c graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotNodeClassSubstitutions.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotNodeClassSubstitutions.java Thu Nov 06 13:24:16 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/HotSpotNodeClassSubstitutions.java Thu Nov 06 13:26:33 2014 +0100 @@ -60,7 +60,8 @@ if (param.isNull() || ImmutableCode.getValue()) { return null; } - return HotSpotObjectConstantImpl.forObject(NodeClass.get((Class) HotSpotObjectConstantImpl.asObject(param))); + HotSpotObjectConstant c = (HotSpotObjectConstant) param; + return c.getNodeClass(); } }