archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Doug Simon 2016-09-14 19:55:08 +00:00
commit 037770a994
24 changed files with 269 additions and 392 deletions
Download patch file Download diff file Expand all files Collapse all files

13
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
View file

@ -26,8 +26,7 @@ package jdk.vm.ci.hotspot;
import static jdk.vm.ci.common.InitTimer.timer;
import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.lang.reflect.Executable;
import jdk.vm.ci.code.BytecodeFrame;
import jdk.vm.ci.code.InstalledCode;
@ -385,10 +384,9 @@ final class CompilerToVM {
native boolean hasFinalizableSubclass(HotSpotResolvedObjectTypeImpl type);
/**
* Gets the method corresponding to {@code holder} and slot number {@code slot} (i.e.
* {@link Method#slot} or {@link Constructor#slot}).
* Gets the method corresponding to {@code executable}.
*/
native HotSpotResolvedJavaMethodImpl getResolvedJavaMethodAtSlot(Class<?> holder, int slot);
native HotSpotResolvedJavaMethodImpl asResolvedJavaMethod(Executable executable);
/**
* Gets the maximum absolute offset of a PC relative call to {@code address} from any position
@ -616,4 +614,9 @@ final class CompilerToVM {
*/
native int interpreterFrameSize(BytecodeFrame frame);
/**
* Invokes non-public method {@code java.lang.invoke.LambdaForm.compileToBytecode()} on
* {@code lambdaForm} (which must be a {@code java.lang.invoke.LambdaForm} instance).
*/
native void compileToBytecode(Object lambdaForm);
}

35
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
View file

@ -22,7 +22,7 @@
*/
package jdk.vm.ci.hotspot;
import java.lang.reflect.Field;
import java.util.Map;
import jdk.vm.ci.code.BailoutException;
import jdk.vm.ci.code.BytecodeFrame;
@ -56,16 +56,11 @@ public class HotSpotCodeCacheProvider implements CodeCacheProvider {
@Override
public String getMarkName(Mark mark) {
int markId = (int) mark.id;
Field[] fields = runtime.getConfig().getClass().getDeclaredFields();
for (Field f : fields) {
if (f.getName().startsWith("MARKID_")) {
f.setAccessible(true);
try {
if (f.getInt(runtime.getConfig()) == markId) {
return f.getName();
}
} catch (Exception e) {
}
HotSpotVMConfigStore store = runtime.getConfigStore();
for (Map.Entry<String, Long> e : store.getConstants().entrySet()) {
String name = e.getKey();
if (name.startsWith("MARKID_") && e.getValue() == markId) {
return name;
}
}
return CodeCacheProvider.super.getMarkName(mark);
@ -76,17 +71,13 @@ public class HotSpotCodeCacheProvider implements CodeCacheProvider {
*/
@Override
public String getTargetName(Call call) {
Field[] fields = runtime.getConfig().getClass().getDeclaredFields();
for (Field f : fields) {
if (f.getName().endsWith("Stub")) {
f.setAccessible(true);
Object address;
try {
address = f.get(runtime.getConfig());
if (address.equals(call.target)) {
return f.getName() + ":0x" + Long.toHexString((Long) address);
}
} catch (IllegalArgumentException | IllegalAccessException e) {
if (call.target instanceof HotSpotForeignCallTarget) {
long address = ((HotSpotForeignCallTarget) call.target).address;
HotSpotVMConfigStore store = runtime.getConfigStore();
for (Map.Entry<String, VMField> e : store.getFields().entrySet()) {
VMField field = e.getValue();
if (field.isStatic() && field.value != null && field.value == address) {
return e.getValue() + ":0x" + Long.toHexString(address);
}
}
}

32
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMetaAccessProvider.java
View file

@ -28,11 +28,10 @@ import static jdk.vm.ci.hotspot.HotSpotResolvedObjectTypeImpl.fromObjectClass;
import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Objects;
import jdk.vm.ci.code.CodeUtil;
import jdk.vm.ci.code.TargetDescription;
@ -78,35 +77,8 @@ public class HotSpotMetaAccessProvider implements MetaAccessProvider {
return new HotSpotSignature(runtime, signature);
}
/**
* {@link Field} object of {@link Method#slot}.
*/
private Field reflectionMethodSlot = getReflectionSlotField(Method.class);
/**
* {@link Field} object of {@link Constructor#slot}.
*/
private Field reflectionConstructorSlot = getReflectionSlotField(Constructor.class);
private static Field getReflectionSlotField(Class<?> reflectionClass) {
try {
Field field = reflectionClass.getDeclaredField("slot");
field.setAccessible(true);
return field;
} catch (NoSuchFieldException | SecurityException e) {
throw new JVMCIError(e);
}
}
public ResolvedJavaMethod lookupJavaMethod(Executable reflectionMethod) {
try {
Class<?> holder = reflectionMethod.getDeclaringClass();
Field slotField = reflectionMethod instanceof Constructor ? reflectionConstructorSlot : reflectionMethodSlot;
final int slot = slotField.getInt(reflectionMethod);
return runtime.getCompilerToVM().getResolvedJavaMethodAtSlot(holder, slot);
} catch (IllegalArgumentException | IllegalAccessException e) {
throw new JVMCIError(e);
}
return runtime.getCompilerToVM().asResolvedJavaMethod(Objects.requireNonNull(reflectionMethod));
}
public ResolvedJavaField lookupJavaField(Field reflectionField) {

91
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java
View file

@ -24,16 +24,17 @@ package jdk.vm.ci.hotspot;
import static jdk.vm.ci.hotspot.CompilerToVM.compilerToVM;
import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
import static jdk.vm.ci.hotspot.HotSpotResolvedObjectTypeImpl.fromObjectClass;
import java.lang.invoke.MethodHandle;
import java.util.Objects;
import jdk.vm.ci.common.JVMCIError;
import jdk.vm.ci.meta.ConstantReflectionProvider;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.MethodHandleAccessProvider;
import jdk.vm.ci.meta.ResolvedJavaField;
import jdk.vm.ci.meta.ResolvedJavaMethod;
import jdk.vm.ci.meta.ResolvedJavaType;
import jdk.vm.ci.meta.Signature;
public class HotSpotMethodHandleAccessProvider implements MethodHandleAccessProvider {
@ -48,88 +49,46 @@ public class HotSpotMethodHandleAccessProvider implements MethodHandleAccessProv
* possible after the {@link HotSpotJVMCIRuntime} is fully initialized.
*/
static class LazyInitialization {
static final ResolvedJavaType lambdaFormType;
static final ResolvedJavaField methodHandleFormField;
static final ResolvedJavaField lambdaFormVmentryField;
static final ResolvedJavaMethod lambdaFormCompileToBytecodeMethod;
static final HotSpotResolvedJavaField memberNameVmtargetField;
static final ResolvedJavaType CLASS = fromObjectClass(LazyInitialization.class);
/**
* Search for an instance field with the given name in a class.
*
* @param className name of the class to search in
* @param declaringType the type declaring the field
* @param fieldName name of the field to be searched
* @param fieldType resolved Java type of the field
* @return resolved Java field
* @throws ClassNotFoundException
* @throws NoSuchFieldError
*/
private static ResolvedJavaField findFieldInClass(String className, String fieldName, ResolvedJavaType fieldType)
throws ClassNotFoundException {
Class<?> clazz = Class.forName(className);
ResolvedJavaType type = runtime().fromClass(clazz);
ResolvedJavaField[] fields = type.getInstanceFields(false);
private static ResolvedJavaField findFieldInClass(ResolvedJavaType declaringType, String fieldName, ResolvedJavaType fieldType) {
ResolvedJavaField[] fields = declaringType.getInstanceFields(false);
for (ResolvedJavaField field : fields) {
if (field.getName().equals(fieldName) && field.getType().equals(fieldType)) {
return field;
}
}
throw new NoSuchFieldError(fieldType.getName() + " " + className + "." + fieldName);
throw new NoSuchFieldError(fieldType.getName() + " " + declaringType + "." + fieldName);
}
private static ResolvedJavaMethod findMethodInClass(String className, String methodName,
ResolvedJavaType resultType, ResolvedJavaType[] parameterTypes) throws ClassNotFoundException {
Class<?> clazz = Class.forName(className);
HotSpotResolvedObjectTypeImpl type = fromObjectClass(clazz);
ResolvedJavaMethod result = null;
for (ResolvedJavaMethod method : type.getDeclaredMethods()) {
if (method.getName().equals(methodName) && signatureMatches(method, resultType, parameterTypes)) {
result = method;
}
}
if (result == null) {
StringBuilder sig = new StringBuilder("(");
for (ResolvedJavaType t : parameterTypes) {
sig.append(t.getName()).append(",");
}
if (sig.length() > 1) {
sig.replace(sig.length() - 1, sig.length(), ")");
} else {
sig.append(')');
}
throw new NoSuchMethodError(resultType.getName() + " " + className + "." + methodName + sig.toString());
}
return result;
private static ResolvedJavaType resolveType(Class<?> c) {
return runtime().fromClass(c);
}
private static boolean signatureMatches(ResolvedJavaMethod m, ResolvedJavaType resultType,
ResolvedJavaType[] parameterTypes) {
Signature s = m.getSignature();
if (!s.getReturnType(CLASS).equals(resultType)) {
return false;
}
if (s.getParameterCount(false) != parameterTypes.length) {
return false;
}
for (int i = 0; i < s.getParameterCount(false); ++i) {
if (!s.getParameterType(i, CLASS).equals(parameterTypes[i])) {
return false;
}
}
return true;
private static ResolvedJavaType resolveType(String className) throws ClassNotFoundException {
return resolveType(Class.forName(className));
}
static {
try {
methodHandleFormField = findFieldInClass("java.lang.invoke.MethodHandle", "form",
fromObjectClass(Class.forName("java.lang.invoke.LambdaForm")));
lambdaFormVmentryField = findFieldInClass("java.lang.invoke.LambdaForm", "vmentry",
fromObjectClass(Class.forName("java.lang.invoke.MemberName")));
lambdaFormCompileToBytecodeMethod = findMethodInClass("java.lang.invoke.LambdaForm", "compileToBytecode",
new HotSpotResolvedPrimitiveType(JavaKind.Void), new ResolvedJavaType[]{});
memberNameVmtargetField = (HotSpotResolvedJavaField) findFieldInClass("java.lang.invoke.MemberName", "vmtarget",
new HotSpotResolvedPrimitiveType(JavaKind.Long));
ResolvedJavaType methodHandleType = resolveType(MethodHandle.class);
ResolvedJavaType memberNameType = resolveType("java.lang.invoke.MemberName");
lambdaFormType = resolveType("java.lang.invoke.LambdaForm");
methodHandleFormField = findFieldInClass(methodHandleType, "form", lambdaFormType);
lambdaFormVmentryField = findFieldInClass(lambdaFormType, "vmentry", memberNameType);
memberNameVmtargetField = (HotSpotResolvedJavaField) findFieldInClass(memberNameType, "vmtarget", resolveType(long.class));
} catch (Throwable ex) {
throw new JVMCIError(ex);
}
@ -173,12 +132,13 @@ public class HotSpotMethodHandleAccessProvider implements MethodHandleAccessProv
return null;
}
if (forceBytecodeGeneration) {
/* Invoke non-public method: MemberName LambdaForm.compileToBytecode() */
LazyInitialization.lambdaFormCompileToBytecodeMethod.invoke(lambdaForm, new JavaConstant[0]);
}
/* Load non-public field: MemberName LambdaForm.vmentry */
JavaConstant memberName = constantReflection.readFieldValue(LazyInitialization.lambdaFormVmentryField, lambdaForm);
if (memberName.isNull() && forceBytecodeGeneration) {
Object lf = ((HotSpotObjectConstant) lambdaForm).asObject(LazyInitialization.lambdaFormType);
compilerToVM().compileToBytecode(Objects.requireNonNull(lf));
memberName = constantReflection.readFieldValue(LazyInitialization.lambdaFormVmentryField, lambdaForm);
assert memberName.isNonNull();
}
return getTargetMethod(memberName);
}
@ -200,4 +160,3 @@ public class HotSpotMethodHandleAccessProvider implements MethodHandleAccessProv
return compilerToVM().getResolvedJavaMethod(object, LazyInitialization.memberNameVmtargetField.offset());
}
}

66
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotModifiers.java Normal file
View file

@ -0,0 +1,66 @@
/*
* Copyright (c) 2016, 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;
import static java.lang.reflect.Modifier.ABSTRACT;
import static java.lang.reflect.Modifier.FINAL;
import static java.lang.reflect.Modifier.INTERFACE;
import static java.lang.reflect.Modifier.NATIVE;
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.STRICT;
import static java.lang.reflect.Modifier.SYNCHRONIZED;
import static java.lang.reflect.Modifier.TRANSIENT;
import static java.lang.reflect.Modifier.VOLATILE;
import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
import java.lang.reflect.Modifier;
/**
* The non-public modifiers in {@link Modifier} that need to be retrieved from
* {@link HotSpotVMConfig}.
*/
public class HotSpotModifiers {
// @formatter:off
public static final int ANNOTATION = config().jvmAccAnnotation;
public static final int ENUM = config().jvmAccEnum;
public static final int VARARGS = config().jvmAccVarargs;
public static final int BRIDGE = config().jvmAccBridge;
public static final int SYNTHETIC = config().jvmAccSynthetic;
// @formatter:on
public static int jvmClassModifiers() {
return PUBLIC | FINAL | INTERFACE | ABSTRACT | ANNOTATION | ENUM | SYNTHETIC;
}
public static int jvmMethodModifiers() {
return PUBLIC | PRIVATE | PROTECTED | STATIC | FINAL | SYNCHRONIZED | BRIDGE | VARARGS | NATIVE | ABSTRACT | STRICT | SYNTHETIC;
}
public static int jvmFieldModifiers() {
return PUBLIC | PRIVATE | PROTECTED | STATIC | FINAL | VOLATILE | TRANSIENT | ENUM | SYNTHETIC;
}
}

4
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaFieldImpl.java
View file

@ -22,6 +22,7 @@
*/
package jdk.vm.ci.hotspot;
import static jdk.vm.ci.hotspot.HotSpotModifiers.jvmFieldModifiers;
import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
import java.lang.annotation.Annotation;
@ -29,7 +30,6 @@ import java.lang.reflect.Field;
import jdk.internal.vm.annotation.Stable;
import jdk.vm.ci.meta.JavaType;
import jdk.vm.ci.meta.ModifiersProvider;
import jdk.vm.ci.meta.ResolvedJavaType;
/**
@ -81,7 +81,7 @@ class HotSpotResolvedJavaFieldImpl implements HotSpotResolvedJavaField {
@Override
public int getModifiers() {
return modifiers & ModifiersProvider.jvmFieldModifiers();
return modifiers & jvmFieldModifiers();
}
@Override

44
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
View file

@ -24,13 +24,15 @@ package jdk.vm.ci.hotspot;
import static jdk.vm.ci.hotspot.CompilerToVM.compilerToVM;
import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
import static jdk.vm.ci.hotspot.HotSpotModifiers.BRIDGE;
import static jdk.vm.ci.hotspot.HotSpotModifiers.SYNTHETIC;
import static jdk.vm.ci.hotspot.HotSpotModifiers.VARARGS;
import static jdk.vm.ci.hotspot.HotSpotModifiers.jvmMethodModifiers;
import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
import java.lang.annotation.Annotation;
import java.lang.reflect.Executable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
import java.util.HashMap;
@ -42,13 +44,11 @@ import jdk.vm.ci.meta.Constant;
import jdk.vm.ci.meta.ConstantPool;
import jdk.vm.ci.meta.DefaultProfilingInfo;
import jdk.vm.ci.meta.ExceptionHandler;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaMethod;
import jdk.vm.ci.meta.JavaType;
import jdk.vm.ci.meta.LineNumberTable;
import jdk.vm.ci.meta.Local;
import jdk.vm.ci.meta.LocalVariableTable;
import jdk.vm.ci.meta.ModifiersProvider;
import jdk.vm.ci.meta.ProfilingInfo;
import jdk.vm.ci.meta.ResolvedJavaMethod;
import jdk.vm.ci.meta.ResolvedJavaType;
@ -210,7 +210,7 @@ final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSp
@Override
public int getModifiers() {
return getAllModifiers() & ModifiersProvider.jvmMethodModifiers();
return getAllModifiers() & jvmMethodModifiers();
}
@Override
@ -490,6 +490,19 @@ final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSp
return javaMethod == null ? null : javaMethod.getAnnotation(annotationClass);
}
public boolean isBridge() {
return (BRIDGE & getModifiers()) != 0;
}
@Override
public boolean isSynthetic() {
return (SYNTHETIC & getModifiers()) != 0;
}
public boolean isVarArgs() {
return (VARARGS & getModifiers()) != 0;
}
public boolean isDefault() {
if (isConstructor()) {
return false;
@ -697,27 +710,6 @@ final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSp
return (getFlags() & config().methodFlagsIntrinsicCandidate) != 0;
}
@Override
public JavaConstant invoke(JavaConstant receiver, JavaConstant[] arguments) {
assert !isConstructor();
Method javaMethod = (Method) toJava();
javaMethod.setAccessible(true);
Object[] objArguments = new Object[arguments.length];
for (int i = 0; i < arguments.length; i++) {
objArguments[i] = HotSpotObjectConstantImpl.asBoxedValue(arguments[i]);
}
Object objReceiver = receiver != null && !receiver.isNull() ? ((HotSpotObjectConstantImpl) receiver).object() : null;
try {
Object objResult = javaMethod.invoke(objReceiver, objArguments);
return javaMethod.getReturnType() == void.class ? null : HotSpotObjectConstantImpl.forBoxedValue(getSignature().getReturnKind(), objResult);
} catch (IllegalAccessException | InvocationTargetException ex) {
throw new IllegalArgumentException(ex);
}
}
/**
* Allocates a compile id for this method by asking the VM for one.
*

6
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl.java
View file

@ -26,6 +26,7 @@ import static java.util.Objects.requireNonNull;
import static jdk.vm.ci.hotspot.CompilerToVM.compilerToVM;
import static jdk.vm.ci.hotspot.HotSpotConstantPool.isSignaturePolymorphicHolder;
import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime;
import static jdk.vm.ci.hotspot.HotSpotModifiers.jvmClassModifiers;
import static jdk.vm.ci.hotspot.HotSpotVMConfig.config;
import static jdk.vm.ci.hotspot.UnsafeAccess.UNSAFE;
@ -49,7 +50,6 @@ import jdk.vm.ci.meta.Constant;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.JavaType;
import jdk.vm.ci.meta.ModifiersProvider;
import jdk.vm.ci.meta.ResolvedJavaField;
import jdk.vm.ci.meta.ResolvedJavaMethod;
import jdk.vm.ci.meta.ResolvedJavaType;
@ -152,7 +152,7 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
if (isArray()) {
return (getElementalType().getModifiers() & (Modifier.PUBLIC | Modifier.PRIVATE | Modifier.PROTECTED)) | Modifier.FINAL | Modifier.ABSTRACT;
} else {
return getAccessFlags() & ModifiersProvider.jvmClassModifiers();
return getAccessFlags() & jvmClassModifiers();
}
}
@ -507,7 +507,7 @@ final class HotSpotResolvedObjectTypeImpl extends HotSpotResolvedJavaType implem
synchronized HotSpotResolvedJavaField createField(String fieldName, JavaType type, long offset, int rawFlags) {
HotSpotResolvedJavaField result = null;
final int flags = rawFlags & ModifiersProvider.jvmFieldModifiers();
final int flags = rawFlags & HotSpotModifiers.jvmFieldModifiers();
final long id = offset + ((long) flags << 32);

6
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotVMConfig.java
View file

@ -117,8 +117,12 @@ class HotSpotVMConfig extends HotSpotVMConfigAccess {
final int jvmAccFieldHasGenericSignature = getConstant("JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE", Integer.class);
final int jvmAccIsCloneableFast = getConstant("JVM_ACC_IS_CLONEABLE_FAST", Integer.class);
// Modifier.SYNTHETIC is not public so we get it via vmStructs.
// These modifiers are not public in Modifier so we get them via vmStructs.
final int jvmAccSynthetic = getConstant("JVM_ACC_SYNTHETIC", Integer.class);
final int jvmAccAnnotation = getConstant("JVM_ACC_ANNOTATION", Integer.class);
final int jvmAccBridge = getConstant("JVM_ACC_BRIDGE", Integer.class);
final int jvmAccVarargs = getConstant("JVM_ACC_VARARGS", Integer.class);
final int jvmAccEnum = getConstant("JVM_ACC_ENUM", Integer.class);
// This is only valid on AMD64.
final int runtimeCallStackSize = getConstant("frame::arg_reg_save_area_bytes", Integer.class, osArch.equals("amd64") ? null : 0);

20
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/UnsafeAccess.java
View file

@ -22,8 +22,6 @@
*/
package jdk.vm.ci.hotspot;
import java.lang.reflect.Field;
import jdk.internal.misc.Unsafe;
/**
@ -31,21 +29,5 @@ import jdk.internal.misc.Unsafe;
*/
class UnsafeAccess {
static final Unsafe UNSAFE = initUnsafe();
private static Unsafe initUnsafe() {
try {
// Fast path when we are trusted.
return Unsafe.getUnsafe();
} catch (SecurityException se) {
// Slow path when we are not trusted.
try {
Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
theUnsafe.setAccessible(true);
return (Unsafe) theUnsafe.get(Unsafe.class);
} catch (Exception e) {
throw new RuntimeException("exception while trying to get Unsafe", e);
}
}
}
static final Unsafe UNSAFE = Unsafe.getUnsafe();
}

16
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MetaUtil.java
View file

@ -22,9 +22,6 @@
*/
package jdk.vm.ci.meta;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
/**
* Miscellaneous collection of utility methods used by {@code jdk.vm.ci.meta} and its clients.
*/
@ -226,17 +223,4 @@ public class MetaUtil {
}
return obj.getClass().getName() + "@" + System.identityHashCode(obj);
}
/**
* Used to lookup constants from {@link Modifier} that are not public (VARARGS, SYNTHETIC etc.).
*/
static int getNonPublicModifierStaticField(String name) {
try {
Field field = Modifier.class.getDeclaredField(name);
field.setAccessible(true);
return field.getInt(null);
} catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
throw new InternalError(e);
}
}
}

32
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ModifiersProvider.java
View file

@ -22,18 +22,9 @@
*/
package jdk.vm.ci.meta;
import static java.lang.reflect.Modifier.ABSTRACT;
import static java.lang.reflect.Modifier.FINAL;
import static java.lang.reflect.Modifier.INTERFACE;
import static java.lang.reflect.Modifier.NATIVE;
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.STRICT;
import static java.lang.reflect.Modifier.SYNCHRONIZED;
import static java.lang.reflect.Modifier.TRANSIENT;
import static java.lang.reflect.Modifier.VOLATILE;
import java.lang.reflect.Modifier;
@ -42,17 +33,9 @@ import java.lang.reflect.Modifier;
* language {@linkplain #getModifiers() modifiers}.
*/
public interface ModifiersProvider {
int BRIDGE = MetaUtil.getNonPublicModifierStaticField("BRIDGE");
int VARARGS = MetaUtil.getNonPublicModifierStaticField("VARARGS");
int SYNTHETIC = MetaUtil.getNonPublicModifierStaticField("SYNTHETIC");
int ANNOTATION = MetaUtil.getNonPublicModifierStaticField("ANNOTATION");
int ENUM = MetaUtil.getNonPublicModifierStaticField("ENUM");
int MANDATED = MetaUtil.getNonPublicModifierStaticField("MANDATED");
/**
* Returns the Java Virtual Machine modifiers for this element. Note that this can differ from
* standard Java Reflection modifiers. For example at the JVM level, classes (
* {@link ResolvedJavaType}) can not be private or protected.
* Returns the modifiers for this element.
*/
int getModifiers();
@ -161,17 +144,4 @@ public interface ModifiersProvider {
default boolean isConcrete() {
return !isAbstract();
}
static int jvmClassModifiers() {
// no SUPER
return PUBLIC | FINAL | INTERFACE | ABSTRACT | ANNOTATION | ENUM | SYNTHETIC;
}
static int jvmMethodModifiers() {
return PUBLIC | PRIVATE | PROTECTED | STATIC | FINAL | SYNCHRONIZED | BRIDGE | VARARGS | NATIVE | ABSTRACT | STRICT | SYNTHETIC;
}
static int jvmFieldModifiers() {
return PUBLIC | PRIVATE | PROTECTED | STATIC | FINAL | VOLATILE | TRANSIENT | ENUM | SYNTHETIC;
}
}

33
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java
View file

@ -26,7 +26,6 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
/**
@ -72,14 +71,6 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
*/
int getMaxStackSize();
/**
* {@inheritDoc}
* <p>
* Only the {@linkplain Modifier#methodModifiers() method flags} specified in the JVM
* specification will be included in the returned mask.
*/
int getModifiers();
default boolean isFinal() {
return ModifiersProvider.super.isFinalFlagSet();
}
@ -88,9 +79,7 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
* Determines if this method is a synthetic method as defined by the Java Language
* Specification.
*/
default boolean isSynthetic() {
return (SYNTHETIC & getModifiers()) == SYNTHETIC;
}
boolean isSynthetic();
/**
* Checks that the method is a
@ -99,9 +88,7 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
*
* @return whether the method is a varargs method
*/
default boolean isVarArgs() {
return (VARARGS & getModifiers()) == VARARGS;
}
boolean isVarArgs();
/**
* Checks that the method is a
@ -110,9 +97,7 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
*
* @return whether the method is a bridge method
*/
default boolean isBridge() {
return (BRIDGE & getModifiers()) == BRIDGE;
}
boolean isBridge();
/**
* Returns {@code true} if this method is a default method; returns {@code false} otherwise.
@ -227,18 +212,6 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
*/
LocalVariableTable getLocalVariableTable();
/**
* Invokes the underlying method represented by this object, on the specified object with the
* specified parameters. This method is similar to a reflective method invocation by
* {@link Method#invoke}.
*
* @param receiver The receiver for the invocation, or {@code null} if it is a static method.
* @param arguments The arguments for the invocation.
* @return The value returned by the method invocation, or {@code null} if the return type is
* {@code void}.
*/
JavaConstant invoke(JavaConstant receiver, JavaConstant[] arguments);
/**
* Gets the encoding of (that is, a constant representing the value of) this method.
*

9
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaType.java
View file

@ -68,15 +68,6 @@ public interface ResolvedJavaType extends JavaType, ModifiersProvider, Annotated
*/
boolean isPrimitive();
/**
* {@inheritDoc}
* <p>
* Only the flags specified in the JVM specification will be included in the returned mask. This
* method is identical to {@link Class#getModifiers()} in terms of the value return for this
* type.
*/
int getModifiers();
/*
* The setting of the final bit for types is a bit confusing since arrays are marked as final.
* This method provides a semantically equivalent test that appropriate for types.

32
hotspot/src/share/vm/jvmci/jvmciCompilerToVM.cpp
View file

@ -473,9 +473,20 @@ C2V_VMENTRY(jlong, getExceptionTableStart, (JNIEnv *, jobject, jobject jvmci_met
return (jlong) (address) method->exception_table_start();
C2V_END
C2V_VMENTRY(jobject, getResolvedJavaMethodAtSlot, (JNIEnv *, jobject, jclass holder_handle, jint slot))
oop java_class = JNIHandles::resolve(holder_handle);
Klass* holder = java_lang_Class::as_Klass(java_class);
C2V_VMENTRY(jobject, asResolvedJavaMethod, (JNIEnv *, jobject, jobject executable_handle))
oop executable = JNIHandles::resolve(executable_handle);
oop mirror = NULL;
int slot = 0;
if (executable->klass() == SystemDictionary::reflect_Constructor_klass()) {
mirror = java_lang_reflect_Constructor::clazz(executable);
slot = java_lang_reflect_Constructor::slot(executable);
} else {
assert(executable->klass() == SystemDictionary::reflect_Method_klass(), "wrong type");
mirror = java_lang_reflect_Method::clazz(executable);
slot = java_lang_reflect_Method::slot(executable);
}
Klass* holder = java_lang_Class::as_Klass(mirror);
methodHandle method = InstanceKlass::cast(holder)->method_with_idnum(slot);
oop result = CompilerToVM::get_jvmci_method(method, CHECK_NULL);
return JNIHandles::make_local(THREAD, result);
@ -1518,6 +1529,17 @@ C2V_VMENTRY(int, interpreterFrameSize, (JNIEnv*, jobject, jobject bytecode_frame
return size + Deoptimization::last_frame_adjust(0, callee_locals) * BytesPerWord;
C2V_END
C2V_VMENTRY(void, compileToBytecode, (JNIEnv*, jobject, jobject lambda_form_handle))
Handle lambda_form = JNIHandles::resolve_non_null(lambda_form_handle);
if (lambda_form->is_a(SystemDictionary::LambdaForm_klass())) {
TempNewSymbol compileToBytecode = SymbolTable::new_symbol("compileToBytecode", CHECK);
JavaValue result(T_VOID);
JavaCalls::call_special(&result, lambda_form, SystemDictionary::LambdaForm_klass(), compileToBytecode, vmSymbols::void_method_signature(), CHECK);
} else {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
err_msg("Unexpected type: %s", lambda_form->klass()->external_name()));
}
C2V_END
#define CC (char*) /*cast a literal from (const char*)*/
#define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(c2v_ ## f))
@ -1525,6 +1547,7 @@ C2V_END
#define STRING "Ljava/lang/String;"
#define OBJECT "Ljava/lang/Object;"
#define CLASS "Ljava/lang/Class;"
#define EXECUTABLE "Ljava/lang/reflect/Executable;"
#define STACK_TRACE_ELEMENT "Ljava/lang/StackTraceElement;"
#define INSTALLED_CODE "Ljdk/vm/ci/code/InstalledCode;"
#define TARGET_DESCRIPTION "Ljdk/vm/ci/code/TargetDescription;"
@ -1572,7 +1595,7 @@ JNINativeMethod CompilerToVM::methods[] = {
{CC "getClassInitializer", CC "(" HS_RESOLVED_KLASS ")" HS_RESOLVED_METHOD, FN_PTR(getClassInitializer)},
{CC "hasFinalizableSubclass", CC "(" HS_RESOLVED_KLASS ")Z", FN_PTR(hasFinalizableSubclass)},
{CC "getMaxCallTargetOffset", CC "(J)J", FN_PTR(getMaxCallTargetOffset)},
{CC "getResolvedJavaMethodAtSlot", CC "(" CLASS "I)" HS_RESOLVED_METHOD, FN_PTR(getResolvedJavaMethodAtSlot)},
{CC "asResolvedJavaMethod", CC "(" EXECUTABLE ")" HS_RESOLVED_METHOD, FN_PTR(asResolvedJavaMethod)},
{CC "getResolvedJavaMethod", CC "(Ljava/lang/Object;J)" HS_RESOLVED_METHOD, FN_PTR(getResolvedJavaMethod)},
{CC "getConstantPool", CC "(Ljava/lang/Object;)" HS_CONSTANT_POOL, FN_PTR(getConstantPool)},
{CC "getResolvedJavaType", CC "(Ljava/lang/Object;JZ)" HS_RESOLVED_KLASS, FN_PTR(getResolvedJavaType)},
@ -1599,6 +1622,7 @@ JNINativeMethod CompilerToVM::methods[] = {
{CC "flushDebugOutput", CC "()V", FN_PTR(flushDebugOutput)},
{CC "methodDataProfileDataSize", CC "(JI)I", FN_PTR(methodDataProfileDataSize)},
{CC "interpreterFrameSize", CC "(" BYTECODE_FRAME ")I", FN_PTR(interpreterFrameSize)},
{CC "compileToBytecode", CC "(" OBJECT ")V", FN_PTR(compileToBytecode)},
};
int CompilerToVM::methods_count() {

5
hotspot/src/share/vm/jvmci/vmStructs_jvmci.cpp
View file

@ -327,8 +327,11 @@
declare_constant(JVM_ACC_FIELD_INTERNAL) \
declare_constant(JVM_ACC_FIELD_STABLE) \
declare_constant(JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE) \
declare_preprocessor_constant("JVM_ACC_VARARGS", JVM_ACC_VARARGS) \
declare_preprocessor_constant("JVM_ACC_BRIDGE", JVM_ACC_BRIDGE) \
declare_preprocessor_constant("JVM_ACC_ANNOTATION", JVM_ACC_ANNOTATION) \
declare_preprocessor_constant("JVM_ACC_ENUM", JVM_ACC_ENUM) \
declare_preprocessor_constant("JVM_ACC_SYNTHETIC", JVM_ACC_SYNTHETIC) \
declare_preprocessor_constant("JVM_RECOGNIZED_FIELD_MODIFIERS", JVM_RECOGNIZED_FIELD_MODIFIERS) \
\
declare_constant(JVM_CONSTANT_Utf8) \
declare_constant(JVM_CONSTANT_Unicode) \

13
hotspot/test/compiler/jvmci/common/CTVMUtilities.java
View file

@ -57,18 +57,7 @@ public class CTVMUtilities {
if (!(method instanceof Method || method instanceof Constructor)) {
throw new Error("wrong executable type " + method.getClass());
}
Field slotField;
int slot;
try {
slotField = method.getClass().getDeclaredField("slot");
boolean old = slotField.isAccessible();
slotField.setAccessible(true);
slot = slotField.getInt(method);
slotField.setAccessible(old);
} catch (ReflectiveOperationException e) {
throw new Error("TEST BUG: Can't get slot field", e);
}
return CompilerToVMHelper.getResolvedJavaMethodAtSlot(cls, slot);
return CompilerToVMHelper.asResolvedJavaMethod(method);
}
public static HotSpotResolvedJavaMethod getResolvedMethod(

7
hotspot/test/compiler/jvmci/common/patches/jdk.vm.ci/jdk/vm/ci/hotspot/CompilerToVMHelper.java
View file

@ -28,6 +28,7 @@ import jdk.vm.ci.code.InvalidInstalledCodeException;
import jdk.vm.ci.code.TargetDescription;
import jdk.vm.ci.meta.ConstantPool;
import jdk.vm.ci.meta.ResolvedJavaMethod;
import java.lang.reflect.Executable;
/**
* A simple "proxy" class to get test access to CompilerToVM package-private methods
@ -171,9 +172,9 @@ public class CompilerToVMHelper {
return CTVM.hasFinalizableSubclass((HotSpotResolvedObjectTypeImpl) type);
}
public static HotSpotResolvedJavaMethodImpl getResolvedJavaMethodAtSlot(
Class<?> holder, int slot) {
return CTVM.getResolvedJavaMethodAtSlot(holder, slot);
public static HotSpotResolvedJavaMethodImpl asResolvedJavaMethod(
Executable executable) {
return CTVM.asResolvedJavaMethod(executable);
}
public static long getMaxCallTargetOffset(long address) {

54
hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodAtSlotTest.java → hotspot/test/compiler/jvmci/compilerToVM/AsResolvedJavaMethodTest.java
View file

@ -36,7 +36,7 @@
* jdk.vm.ci/jdk.vm.ci.meta
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.GetResolvedJavaMethodAtSlotTest
* compiler.jvmci.compilerToVM.AsResolvedJavaMethodTest
*/
package compiler.jvmci.compilerToVM;
@ -45,10 +45,12 @@ import jdk.test.lib.Asserts;
import jdk.vm.ci.hotspot.CompilerToVMHelper;
import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
import java.util.HashMap;
import java.util.Map;
import java.lang.reflect.Executable;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.List;
public class GetResolvedJavaMethodAtSlotTest {
public class AsResolvedJavaMethodTest {
private static class A {
{
@ -81,41 +83,31 @@ public class GetResolvedJavaMethodAtSlotTest {
}
public static void main(String[] args) {
Map<Class<?>, Integer> testCases = getTestCases();
testCases.forEach(GetResolvedJavaMethodAtSlotTest::test);
List<Class<?>> testCases = getTestCases();
testCases.forEach(AsResolvedJavaMethodTest::test);
}
private static Map<Class<?>, Integer> getTestCases() {
Map<Class<?>, Integer> testCases = new HashMap<>();
testCases.put(A.class, 5); // ctor, init, f1, f2, f3
testCases.put(S.class, 5); // ctor, cinit, f1, f2, f3
testCases.put(I.class, 3); // f1, f2, f3
testCases.put(B.class, 2); // ctor, f4
private static List<Class<?>> getTestCases() {
List<Class<?>> testCases = new ArrayList<>();
testCases.add(A.class);
testCases.add(S.class);
testCases.add(I.class);
testCases.add(B.class);
return testCases;
}
private static void test(Class<?> aClass, int methodNumber) {
testSlotBigger(aClass);
testCorrectMethods(aClass, methodNumber);
private static void test(Class<?> aClass) {
testCorrectMethods(aClass);
}
private static void testSlotBigger(Class<?> holder) {
HotSpotResolvedJavaMethod method
= CompilerToVMHelper.getResolvedJavaMethodAtSlot(holder, 50);
Asserts.assertNull(method, "Got method for non existing slot 50 in "
+ holder);
}
private static void testCorrectMethods(Class<?> holder, int methodsNumber) {
for (int i = 0; i < methodsNumber; i++) {
String caseName = String.format("slot %d in %s",
i, holder.getCanonicalName());
private static void testCorrectMethods(Class<?> holder) {
List<Executable> executables = new ArrayList<>();
executables.addAll(Arrays.asList(holder.getDeclaredMethods()));
executables.addAll(Arrays.asList(holder.getDeclaredConstructors()));
for (Executable executable : executables) {
HotSpotResolvedJavaMethod method = CompilerToVMHelper
.getResolvedJavaMethodAtSlot(holder, i);
Asserts.assertNotNull(method, caseName + " did not got method");
Asserts.assertEQ(holder,
CompilerToVMHelper.getMirror(method.getDeclaringClass()),
caseName + " : unexpected declaring class");
.asResolvedJavaMethod(executable);
Asserts.assertNotNull(method, "could not convert " + method);
}
}
}

48
hotspot/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java
View file

@ -74,45 +74,37 @@ public class FindUniqueConcreteMethodTest {
private static Set<TestCase> createTestCases() {
Set<TestCase> result = new HashSet<>();
// a public method
result.add(new TestCase(true, SingleSubclass.class,
SingleSubclass.class, "usualMethod"));
result.add(new TestCase(true, SingleSubclass.class, "usualMethod"));
// overriden method
result.add(new TestCase(true, SingleSubclass.class,
SingleSubclass.class, "overridenMethod"));
result.add(new TestCase(true, SingleSubclass.class, "overridenMethod"));
// private method
result.add(new TestCase(true, SingleSubclass.class,
SingleSubclass.class, "privateMethod"));
result.add(new TestCase(true, SingleSubclass.class, "privateMethod"));
// protected method
result.add(new TestCase(true, SingleSubclass.class,
SingleSubclass.class, "protectedMethod"));
result.add(new TestCase(true, SingleSubclass.class, "protectedMethod"));
// default(package-private) method
result.add(new TestCase(true, SingleSubclass.class,
SingleSubclass.class, "defaultAccessMethod"));
result.add(new TestCase(true, SingleSubclass.class, "defaultAccessMethod"));
// default interface method redefined in implementer
result.add(new TestCase(true, MultipleImplementer1.class,
MultipleImplementer1.class, "defaultMethod"));
result.add(new TestCase(true, MultipleImplementer1.class, "defaultMethod"));
// interface method
result.add(new TestCase(true, MultipleImplementer1.class,
MultipleImplementer1.class, "testMethod"));
result.add(new TestCase(true, MultipleImplementer1.class, "testMethod"));
// default interface method not redefined in implementer
result.add(new TestCase(true, SingleImplementer.class,
SingleImplementerInterface.class, "defaultMethod"));
// result.add(new TestCase(true, SingleImplementer.class,
// SingleImplementerInterface.class, "defaultMethod"));
// static method
result.add(new TestCase(false, SingleSubclass.class,
SingleSubclass.class, "staticMethod"));
result.add(new TestCase(false, SingleSubclass.class, "staticMethod"));
// interface method
result.add(new TestCase(false, MultipleSuperImplementers.class,
DuplicateSimpleSingleImplementerInterface.class, "interfaceMethod", false));
DuplicateSimpleSingleImplementerInterface.class, "interfaceMethod"));
result.add(new TestCase(false, MultipleSuperImplementers.class,
SimpleSingleImplementerInterface.class, "interfaceMethod", false));
SimpleSingleImplementerInterface.class, "interfaceMethod"));
return result;
}
private void runTest(TestCase tcase) throws NoSuchMethodException {
System.out.println(tcase);
Method method = tcase.holder.getDeclaredMethod(tcase.methodName);
HotSpotResolvedJavaMethod testMethod = CTVMUtilities
.getResolvedMethod(tcase.methodFromReceiver ? tcase.receiver : tcase.holder, method);
HotSpotResolvedJavaMethod testMethod = CTVMUtilities.getResolvedMethod(method);
HotSpotResolvedObjectType resolvedType = CompilerToVMHelper
.lookupType(Utils.toJVMTypeSignature(tcase.receiver), getClass(),
/* resolve = */ true);
@ -127,25 +119,23 @@ public class FindUniqueConcreteMethodTest {
public final Class<?> holder;
public final String methodName;
public final boolean isPositive;
public final boolean methodFromReceiver;
public TestCase(boolean isPositive, Class<?> clazz, Class<?> holder,
String methodName, boolean methodFromReceiver) {
String methodName) {
this.receiver = clazz;
this.methodName = methodName;
this.isPositive = isPositive;
this.holder = holder;
this.methodFromReceiver = methodFromReceiver;
}
public TestCase(boolean isPositive, Class<?> clazz, Class<?> holder, String methodName) {
this(isPositive, clazz, holder, methodName, true);
public TestCase(boolean isPositive, Class<?> clazz, String methodName) {
this(isPositive, clazz, clazz, methodName);
}
@Override
public String toString() {
return String.format("CASE: receiver=%s, holder=%s, method=%s, isPositive=%s, methodFromReceiver=%s",
receiver.getName(), holder.getName(), methodName, isPositive, methodFromReceiver);
return String.format("CASE: receiver=%s, holder=%s, method=%s, isPositive=%s",
receiver.getName(), holder.getName(), methodName, isPositive);
}
}
}

26
hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java
View file

@ -52,6 +52,7 @@ import jdk.vm.ci.hotspot.PublicMetaspaceWrapperObject;
import sun.hotspot.WhiteBox;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
public class GetResolvedJavaMethodTest {
private static enum TestCase {
@ -65,9 +66,7 @@ public class GetResolvedJavaMethodTest {
JAVA_METHOD_BASE {
@Override
HotSpotResolvedJavaMethod getResolvedJavaMethod() {
HotSpotResolvedJavaMethod methodInstance
= CompilerToVMHelper.getResolvedJavaMethodAtSlot(
TEST_CLASS, 0);
HotSpotResolvedJavaMethod methodInstance = TEST_METHOD;
try {
METASPACE_METHOD_FIELD.set(methodInstance,
getPtrToMethod());
@ -82,9 +81,7 @@ public class GetResolvedJavaMethodTest {
@Override
HotSpotResolvedJavaMethod getResolvedJavaMethod() {
long ptr = getPtrToMethod();
HotSpotResolvedJavaMethod methodInstance
= CompilerToVMHelper.getResolvedJavaMethodAtSlot(
TEST_CLASS, 0);
HotSpotResolvedJavaMethod methodInstance = TEST_METHOD;
try {
METASPACE_METHOD_FIELD.set(methodInstance, ptr / 2L);
} catch (ReflectiveOperationException e) {
@ -98,9 +95,7 @@ public class GetResolvedJavaMethodTest {
@Override
HotSpotResolvedJavaMethod getResolvedJavaMethod() {
long ptr = getPtrToMethod();
HotSpotResolvedJavaMethod methodInstance
= CompilerToVMHelper.getResolvedJavaMethodAtSlot(
TEST_CLASS, 0);
HotSpotResolvedJavaMethod methodInstance = TEST_METHOD;
try {
METASPACE_METHOD_FIELD.set(methodInstance, 0L);
} catch (ReflectiveOperationException e) {
@ -118,16 +113,21 @@ public class GetResolvedJavaMethodTest {
private static final WhiteBox WB = WhiteBox.getWhiteBox();
private static final Field METASPACE_METHOD_FIELD;
private static final Class<?> TEST_CLASS = GetResolvedJavaMethodTest.class;
private static final HotSpotResolvedJavaMethod TEST_METHOD;
private static final long PTR;
static {
HotSpotResolvedJavaMethod method
= CompilerToVMHelper.getResolvedJavaMethodAtSlot(TEST_CLASS, 0);
try {
Method method = TEST_CLASS.getDeclaredMethod("test", TestCase.class);
TEST_METHOD = CompilerToVMHelper.asResolvedJavaMethod(method);
} catch (NoSuchMethodException e) {
throw new Error("TESTBUG : " + e, e);
}
try {
// jdk.vm.ci.hotspot.HotSpotResolvedJavaMethodImpl.metaspaceMethod
METASPACE_METHOD_FIELD = method.getClass()
METASPACE_METHOD_FIELD = TEST_METHOD.getClass()
.getDeclaredField("metaspaceMethod");
METASPACE_METHOD_FIELD.setAccessible(true);
PTR = (long) METASPACE_METHOD_FIELD.get(method);
PTR = (long) METASPACE_METHOD_FIELD.get(TEST_METHOD);
} catch (ReflectiveOperationException e) {
throw new Error("TESTBUG : " + e, e);
}

19
hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderData.java
View file

@ -23,6 +23,10 @@
package jdk.vm.ci.hotspot.test;
import java.lang.reflect.Field;
import org.testng.annotations.DataProvider;
import jdk.internal.misc.Unsafe;
import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider;
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntimeProvider;
@ -32,27 +36,14 @@ import jdk.vm.ci.meta.Constant;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.runtime.JVMCI;
import org.testng.annotations.DataProvider;
import java.lang.reflect.Field;
public class MemoryAccessProviderData {
private static final Unsafe UNSAFE = getUnsafe();
private static final Unsafe UNSAFE = Unsafe.getUnsafe();
private static final HotSpotConstantReflectionProvider CONSTANT_REFLECTION = (HotSpotConstantReflectionProvider) JVMCI.getRuntime().getHostJVMCIBackend().getConstantReflection();
private static final TestClass TEST_OBJECT = new TestClass();
private static final JavaConstant TEST_CONSTANT = CONSTANT_REFLECTION.forObject(TEST_OBJECT);
private static final JavaConstant TEST_CLASS_CONSTANT = CONSTANT_REFLECTION.forObject(TestClass.class);
private static Unsafe getUnsafe() {
try {
Field f = Unsafe.class.getDeclaredField("theUnsafe");
f.setAccessible(true);
return (Unsafe) f.get(null);
} catch (NoSuchFieldException | IllegalAccessException e) {
throw new RuntimeException("Unable to get Unsafe instance.", e);
}
}
@DataProvider(name = "positiveObject")
public static Object[][] getPositiveObjectJavaKind() {
HotSpotJVMCIRuntimeProvider runtime = (HotSpotJVMCIRuntimeProvider) JVMCI.getRuntime();

1
hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java
View file

@ -438,7 +438,6 @@ public class TestResolvedJavaMethod extends MethodUniverse {
// @formatter:off
private static final String[] untestedApiMethods = {
"invoke",
"newInstance",
"getDeclaringClass",
"getEncoding",

49
hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java
View file

@ -35,28 +35,6 @@
package jdk.vm.ci.runtime.test;
import jdk.internal.reflect.ConstantPool;
import jdk.vm.ci.common.JVMCIError;
import jdk.vm.ci.meta.Assumptions.AssumptionResult;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.ModifiersProvider;
import jdk.vm.ci.meta.ResolvedJavaField;
import jdk.vm.ci.meta.ResolvedJavaMethod;
import jdk.vm.ci.meta.ResolvedJavaType;
import org.junit.Test;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import static java.lang.reflect.Modifier.isAbstract;
import static java.lang.reflect.Modifier.isFinal;
import static java.lang.reflect.Modifier.isPrivate;
@ -70,6 +48,28 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.junit.Test;
import jdk.internal.reflect.ConstantPool;
import jdk.vm.ci.common.JVMCIError;
import jdk.vm.ci.meta.Assumptions.AssumptionResult;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.ResolvedJavaField;
import jdk.vm.ci.meta.ResolvedJavaMethod;
import jdk.vm.ci.meta.ResolvedJavaType;
/**
* Tests for {@link ResolvedJavaType}.
*/
@ -146,8 +146,9 @@ public class TestResolvedJavaType extends TypeUniverse {
public void getModifiersTest() {
for (Class<?> c : classes) {
ResolvedJavaType type = metaAccess.lookupJavaType(c);
int expected = c.getModifiers() & ModifiersProvider.jvmClassModifiers();
int actual = type.getModifiers() & ModifiersProvider.jvmClassModifiers();
int mask = Modifier.classModifiers() & ~Modifier.STATIC;
int expected = c.getModifiers() & mask;
int actual = type.getModifiers() & mask;
Class<?> elementalType = c;
while (elementalType.isArray()) {
elementalType = elementalType.getComponentType();