Mercurial > hg > truffle
diff c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypeResolvedImpl.java @ 2289:6190d20bd6d6
merge
author | Lukas Stadler <lukas.stadler@jku.at> |
---|---|
date | Mon, 11 Apr 2011 11:25:06 +0200 |
parents | 762de4b26788 |
children | e3c42b8de67e |
line wrap: on
line diff
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypeResolvedImpl.java Mon Apr 11 10:37:24 2011 +0200 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotTypeResolvedImpl.java Mon Apr 11 11:25:06 2011 +0200 @@ -127,7 +127,7 @@ } @Override - public boolean isInstance(Object obj) { + public boolean isInstance(CiConstant obj) { return javaMirror.isInstance(obj); } @@ -148,7 +148,7 @@ @Override public boolean isSubtypeOf(RiType other) { - if (other.isResolved()) { + if (other instanceof HotSpotTypeResolved) { return compiler.getVMEntries().RiType_isSubtypeOf(this, other); } // No resolved type is a subtype of an unresolved type.