Mercurial > hg > graal-jvmci-8
changeset 23318:293eb76b86d3
Remove ResolvedJavaType.asExactType
author | Tom Rodriguez <tom.rodriguez@oracle.com> |
---|---|
date | Tue, 08 Mar 2016 10:01:31 -0800 |
parents | 1fe52e24abe2 |
children | c1935b089c01 |
files | jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java |
diffstat | 5 files changed, 0 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java Tue Mar 08 10:01:28 2016 -0800 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectType.java Tue Mar 08 10:01:31 2016 -0800 @@ -60,8 +60,6 @@ HotSpotResolvedObjectType findLeastCommonAncestor(ResolvedJavaType otherType); - HotSpotResolvedObjectType asExactType(); - default boolean isPrimitive() { return false; }
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java Tue Mar 08 10:01:28 2016 -0800 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java Tue Mar 08 10:01:31 2016 -0800 @@ -299,11 +299,6 @@ } @Override - public HotSpotResolvedObjectType asExactType() { - return isLeaf() ? this : null; - } - - @Override public AssumptionResult<Boolean> hasFinalizableSubclass() { assert !isArray(); if (!compilerToVM().hasFinalizableSubclass(this)) {
--- a/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java Tue Mar 08 10:01:28 2016 -0800 +++ b/jvmci/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedPrimitiveType.java Tue Mar 08 10:01:31 2016 -0800 @@ -85,11 +85,6 @@ } @Override - public ResolvedJavaType asExactType() { - return this; - } - - @Override public ResolvedJavaType getSuperclass() { return null; }
--- a/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java Tue Mar 08 10:01:28 2016 -0800 +++ b/jvmci/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java Tue Mar 08 10:01:31 2016 -0800 @@ -138,14 +138,6 @@ boolean isInstance(JavaConstant obj); /** - * Returns this type if it is an exact type otherwise returns null. This type is exact if it is - * void, primitive, final, or an array of a final or primitive type. - * - * @return this type if it is exact; {@code null} otherwise - */ - ResolvedJavaType asExactType(); - - /** * Gets the super class of this type. If this type represents either the {@code Object} class, * an interface, a primitive type, or void, then null is returned. If this object represents an * array class then the type object representing the {@code Object} class is returned.
--- a/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java Tue Mar 08 10:01:28 2016 -0800 +++ b/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java Tue Mar 08 10:01:31 2016 -0800 @@ -178,34 +178,6 @@ } } - private static Class<?> asExactClass(Class<?> c) { - if (c.isArray()) { - if (asExactClass(c.getComponentType()) != null) { - return c; - } - } else { - if (c.isPrimitive() || Modifier.isFinal(c.getModifiers())) { - return c; - } - } - return null; - } - - @Test - public void asExactTypeTest() { - for (Class<?> c : classes) { - ResolvedJavaType type = metaAccess.lookupJavaType(c); - ResolvedJavaType exactType = type.asExactType(); - Class<?> expected = asExactClass(c); - if (expected == null) { - assertTrue("exact(" + c.getName() + ") != null", exactType == null); - } else { - assertNotNull(exactType); - assertTrue(exactType.equals(metaAccess.lookupJavaType(expected))); - } - } - } - @Test public void getSuperclassTest() { for (Class<?> c : classes) {