Mercurial > hg > graal-jvmci-8
diff c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypeResolved.java @ 1433:efba53f86c4f
various fixes and enhancements
* correct refmap->oopmap conversion (register numbering, stack slot numbering)
* fixes for inlining (correct scoping in exception handler lookup, NPE in scope conversion)
* support for "jump to runtime stub" (patching code needs to be aware of jmp instruction)
* provide more information about methods (to allow inlining: has_balanced_monitors, etc.)
* fixes to signature type lookup
* isSubTypeOf: correct handling of array classes
* RiType: componentType/arrayOf
* prologue: inline cache check, icmiss stub
* klass state check (resolved but not initialized) in newinstance
* card table write barriers
* c1x classes are optional (to allow running c1 without them)
* correct for stored frame pointer in calling conventions (methods with arguments on stack)
* getType(Class<?>) for some basic types, used for optimizations and folding
* RiMethod/RiType: throw exception instead of silent failure on unsupported operations
* RiType: resolved/unresolved array type support
* refactoring: new on-demand template generation mechanism
* optimizations: template specialization for no_null_check, given length, etc.
| author | Lukas Stadler <lukas.stadler@oracle.com> |
|---|---|
| date | Thu, 16 Sep 2010 19:42:20 -0700 |
| parents | 949ade3f2ff3 |
| children | 72cfb36c6bb2 |
line wrap: on
line diff
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypeResolved.java Wed Sep 01 17:13:38 2010 -0700 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypeResolved.java Thu Sep 16 19:42:20 2010 -0700 @@ -17,8 +17,11 @@ */ package com.sun.hotspot.c1x; +import java.lang.reflect.*; + import com.sun.cri.ci.*; import com.sun.cri.ri.*; +import com.sun.hotspot.c1x.logging.*; /** * Implementation of RiType for resolved non-primitive HotSpot classes. @@ -39,9 +42,10 @@ private final boolean isInstanceClass; private final boolean isInterface; private final int instanceSize; + private final RiType componentType; public HotSpotTypeResolved(long vmId, long javaMirrorVmId, String name, int accessFlags, boolean hasFinalizer, boolean hasSubclass, boolean hasFinalizableSubclass, boolean isInitialized, - boolean isArrayClass, boolean isInstanceClass, boolean isInterface, int instanceSize) { + boolean isArrayClass, boolean isInstanceClass, boolean isInterface, int instanceSize, RiType componentType) { this.vmId = vmId; this.javaMirrorVmId = javaMirrorVmId; this.name = name; @@ -54,6 +58,7 @@ this.isInstanceClass = isInstanceClass; this.isInterface = isInterface; this.instanceSize = instanceSize; + this.componentType = componentType; } @Override @@ -63,16 +68,23 @@ @Override public RiType arrayOf() { + Logger.log("arrayOf " + name); return null; + //return Compiler.getVMEntries().RiType_arrayOf(vmId); } @Override public RiType componentType() { - return null; + Logger.log("componentType " + name + " isarray: " + isArrayClass); + return Compiler.getVMEntries().RiType_componentType(vmId); } @Override public RiType exactType() { + // TODO is this correct? what's this exactType good for? + if (Modifier.isFinal(accessFlags)) { + return this; + } return null; } @@ -124,8 +136,7 @@ @Override public boolean isInstance(Object obj) { - - return false; + throw new UnsupportedOperationException(); } @Override @@ -145,7 +156,7 @@ @Override public boolean isSubtypeOf(RiType other) { - assert other instanceof HotSpotType : "unexpected 'other' type: " + other; + assert other instanceof HotSpotType : "unexpected 'other' type: " + other; if (other instanceof HotSpotTypeResolved) return Compiler.getVMEntries().RiType_isSubtypeOf(vmId, other); // no resolved type is a subtype of an unresolved type @@ -168,6 +179,11 @@ } @Override + public String simpleName() { + return name; + } + + @Override public RiMethod resolveMethodImpl(RiMethod method) { assert method instanceof HotSpotMethod; return Compiler.getVMEntries().RiType_resolveMethodImpl(vmId, method.name(), method.signature().asString());