Mercurial > hg > graal-compiler
changeset 18296:a6e7531d3dd3
made HotSpotMetaspaceConstantImpl.forMetaspaceObject and HotSpotMetaspaceConstantImpl.getMetaspaceObject package private
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 06 Nov 2014 23:12:41 +0100 |
parents | 17bf458cf86e |
children | d1f5e41c3afe |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotCompiledRuntimeStub.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstantImpl.java |
diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotCompiledRuntimeStub.java Thu Nov 06 23:04:43 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotCompiledRuntimeStub.java Thu Nov 06 23:12:41 2014 +0100 @@ -29,7 +29,6 @@ import com.oracle.graal.api.code.CompilationResult.ConstantReference; import com.oracle.graal.api.code.CompilationResult.DataPatch; import com.oracle.graal.api.code.CompilationResult.Infopoint; -import com.oracle.graal.api.meta.*; import com.oracle.graal.hotspot.meta.*; import com.oracle.graal.hotspot.stubs.*; @@ -57,8 +56,8 @@ if (data.reference instanceof ConstantReference) { ConstantReference ref = (ConstantReference) data.reference; if (ref.getConstant() instanceof HotSpotMetaspaceConstant) { - Object object = HotSpotMetaspaceConstantImpl.getMetaspaceObject((JavaConstant) ref.getConstant()); - if (object instanceof HotSpotResolvedObjectType && ((HotSpotResolvedObjectType) object).getName().equals("[I")) { + HotSpotMetaspaceConstant c = (HotSpotMetaspaceConstant) ref.getConstant(); + if (c.asResolvedJavaType() != null && c.asResolvedJavaType().getName().equals("[I")) { // special handling for NewArrayStub // embedding the type '[I' is safe, since it is never unloaded continue;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstantImpl.java Thu Nov 06 23:04:43 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotMetaspaceConstantImpl.java Thu Nov 06 23:12:41 2014 +0100 @@ -31,11 +31,11 @@ private static final long serialVersionUID = 1003463314013122983L; - public static HotSpotMetaspaceConstantImpl forMetaspaceObject(Kind kind, long primitive, Object metaspaceObject, boolean compressed) { + static HotSpotMetaspaceConstantImpl forMetaspaceObject(Kind kind, long primitive, Object metaspaceObject, boolean compressed) { return new HotSpotMetaspaceConstantImpl(kind, primitive, metaspaceObject, compressed); } - public static Object getMetaspaceObject(JavaConstant constant) { + static Object getMetaspaceObject(JavaConstant constant) { return ((HotSpotMetaspaceConstantImpl) constant).metaspaceObject; }