Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8296967: [JVMCI] rationalize relationship between getCodeSize and get…
…Code in ResolvedJavaMethod Reviewed-by: adinn Backport-of: 37848a9ca2ab3021e7b3b2e112bab4631fbe1d99
- Loading branch information
Showing
8 changed files
with
271 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
145 changes: 145 additions & 0 deletions
145
...jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotResolvedJavaFieldTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| /* | ||
| * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
| package jdk.vm.ci.hotspot.test; | ||
|
|
||
| import static java.lang.reflect.Modifier.FINAL; | ||
| import static java.lang.reflect.Modifier.PRIVATE; | ||
| import static java.lang.reflect.Modifier.PROTECTED; | ||
| import static java.lang.reflect.Modifier.PUBLIC; | ||
| import static java.lang.reflect.Modifier.STATIC; | ||
| import static java.lang.reflect.Modifier.TRANSIENT; | ||
| import static java.lang.reflect.Modifier.VOLATILE; | ||
|
|
||
| import java.lang.reflect.Field; | ||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.lang.reflect.Method; | ||
|
|
||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; | ||
| import jdk.vm.ci.hotspot.HotSpotResolvedJavaField; | ||
| import jdk.vm.ci.hotspot.HotSpotVMConfigAccess; | ||
| import jdk.vm.ci.meta.JavaType; | ||
| import jdk.vm.ci.meta.MetaAccessProvider; | ||
| import jdk.vm.ci.meta.ResolvedJavaField; | ||
| import jdk.vm.ci.meta.ResolvedJavaType; | ||
| import jdk.vm.ci.runtime.JVMCI; | ||
|
|
||
| /** | ||
| * Tests {@link HotSpotResolvedJavaField} functionality. | ||
| */ | ||
| public class HotSpotResolvedJavaFieldTest { | ||
|
|
||
| private static final Class<?>[] classesWithInternalFields = {Class.class, ClassLoader.class}; | ||
|
|
||
| private static final Method createFieldMethod; | ||
| private static final Field indexField; | ||
|
|
||
| static { | ||
| Method m = null; | ||
| Field f = null; | ||
| try { | ||
| Class<?> typeImpl = Class.forName("jdk.vm.ci.hotspot.HotSpotResolvedObjectTypeImpl"); | ||
| m = typeImpl.getDeclaredMethod("createField", JavaType.class, long.class, int.class, int.class); | ||
| m.setAccessible(true); | ||
| Class<?> fieldImpl = Class.forName("jdk.vm.ci.hotspot.HotSpotResolvedJavaFieldImpl"); | ||
| f = fieldImpl.getDeclaredField("index"); | ||
| f.setAccessible(true); | ||
| } catch (Exception e) { | ||
| throw new AssertionError(e); | ||
| } | ||
|
|
||
| createFieldMethod = m; | ||
| indexField = f; | ||
| } | ||
|
|
||
| /** | ||
| * Same as {@code HotSpotModifiers.jvmFieldModifiers()} but works when using a JVMCI version | ||
| * prior to the introduction of that method. | ||
| */ | ||
| private int jvmFieldModifiers() { | ||
| HotSpotJVMCIRuntime runtime = runtime(); | ||
| HotSpotVMConfigAccess access = new HotSpotVMConfigAccess(runtime.getConfigStore()); | ||
| int accEnum = access.getConstant("JVM_ACC_ENUM", Integer.class, 0x4000); | ||
| int accSynthetic = access.getConstant("JVM_ACC_SYNTHETIC", Integer.class, 0x1000); | ||
| return PUBLIC | PRIVATE | PROTECTED | STATIC | FINAL | VOLATILE | TRANSIENT | accEnum | accSynthetic; | ||
| } | ||
|
|
||
| HotSpotJVMCIRuntime runtime() { | ||
| return (HotSpotJVMCIRuntime) JVMCI.getRuntime(); | ||
| } | ||
|
|
||
| MetaAccessProvider getMetaAccess() { | ||
| return runtime().getHostJVMCIBackend().getMetaAccess(); | ||
| } | ||
|
|
||
| /** | ||
| * Tests that {@link HotSpotResolvedJavaField#getModifiers()} only includes the modifiers | ||
| * returned by {@link Field#getModifiers()}. Namely, it must not include | ||
| * {@code HotSpotResolvedJavaField#FIELD_INTERNAL_FLAG}. | ||
| */ | ||
| @Test | ||
| public void testModifiersForInternal() { | ||
| for (Class<?> c : classesWithInternalFields) { | ||
| ResolvedJavaType type = getMetaAccess().lookupJavaType(c); | ||
| for (ResolvedJavaField field : type.getInstanceFields(false)) { | ||
| if (field.isInternal()) { | ||
| Assert.assertEquals(0, ~jvmFieldModifiers() & field.getModifiers()); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Tests that {@code HotSpotResolvedObjectTypeImpl#createField(String, JavaType, long, int)} | ||
| * always returns an {@linkplain ResolvedJavaField#equals(Object) equivalent} object for an | ||
| * internal field. | ||
| * | ||
| * @throws InvocationTargetException | ||
| * @throws IllegalArgumentException | ||
| * @throws IllegalAccessException | ||
| */ | ||
| @Test | ||
| public void testEquivalenceForInternalFields() throws IllegalAccessException, IllegalArgumentException, InvocationTargetException { | ||
| for (Class<?> c : classesWithInternalFields) { | ||
| ResolvedJavaType type = getMetaAccess().lookupJavaType(c); | ||
| for (ResolvedJavaField field : type.getInstanceFields(false)) { | ||
| if (field.isInternal()) { | ||
| HotSpotResolvedJavaField expected = (HotSpotResolvedJavaField) field; | ||
| int index = indexField.getInt(expected); | ||
| ResolvedJavaField actual = (ResolvedJavaField) createFieldMethod.invoke(type, expected.getType(), expected.getOffset(), expected.getModifiers(), index); | ||
| Assert.assertEquals(expected, actual); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testIsInObject() { | ||
| for (Field f : String.class.getDeclaredFields()) { | ||
| HotSpotResolvedJavaField rf = (HotSpotResolvedJavaField) getMetaAccess().lookupJavaField(f); | ||
| Assert.assertEquals(rf.toString(), rf.isInObject(runtime().getHostJVMCIBackend().getConstantReflection().forString("a string")), !rf.isStatic()); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
b464cc2There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues