Merge
This commit is contained in:
commit
3dcd1c1ab0
.hgtags
src
hotspot/share/opto
jdk.internal.vm.compiler/share/classes
org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test
org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta
test
hotspot/jtreg/vmTestbase/vm/mlvm
anonloader
func
castToGrandparent
castToParent
classNameInStackTrace
finalSuperclass
findByName
invalidSuperclass
isGarbageCollected
uniqueClassAndObject
stress
cp/stress/classfmt
correctBootstrap
incorrectBootstrap
manyIndyOneCPX
mh
mt
indy
func
java
jdi
jvmti
mergeCP_indy2manyDiff_a
mergeCP_indy2manyDiff_b
mergeCP_indy2manySame_a
mergeCP_indy2manySame_b
mergeCP_indy2none_a
mergeCP_indy2none_b
mergeCP_indy2same_a
mergeCP_indy2same_b
mergeCP_none2indy_a
mergeCP_none2indy_b
redefineClassInBootstrap
redefineClassInTarget
stepBreakPopReturn
stress
gc/lotsOfCallSites
java
loopsAndThreads
mutableCallSiteDekker
relinkMutableCallSite
relinkMutableCallSiteFreq
relinkVolatileCallSite
relinkVolatileCallSiteFreq
volatileCallSiteDekker
jdi/breakpointInCompiledCode
meth
func
java/throwException
jdi
regression
stress
mixed/stress
jdk
java
net/URL/JarHandlerPkgPrefix
security/KeyAgreement
util/jar/JarFile
jdk/nio/zipfs/jarfs
lib/testlibrary/java/util/jar
sun
lib/jdk/test/lib
3
.hgtags
3
.hgtags
@ -645,7 +645,6 @@ bcbe7b8a77b8971bc221c0be1bd2abb6fb68c2d0 jdk-16+2
|
||||
b58fc60580550a4a587cab729d8fd87223ad6932 jdk-15+29
|
||||
76810b3a88c8c641ae3850a8dfd7c40c984aea9d jdk-16+3
|
||||
6909e4a1f25bfe9a2727026f5845fc1fc44a36aa jdk-15+30
|
||||
78c07dd7240412e60d8694e9dbfd46e57bd42ee0 jdk-16+4
|
||||
78c07dd7240412e60d8694e9dbfd46e57bd42ee0 jdk-16+4
|
||||
e2622818f0bd30e736252eba101fe7d2c27f400b jdk-16+4
|
||||
a32f58c6b8be81877411767de7ba9c4cf087c1b5 jdk-15+31
|
||||
143e258f64af490010eb7e0bacc1cfaeceff0993 jdk-16+5
|
||||
|
@ -2021,8 +2021,8 @@ void PhaseOutput::ScheduleAndBundle() {
|
||||
if (!C->do_scheduling())
|
||||
return;
|
||||
|
||||
// Scheduling code works only with pairs (16 bytes) maximum.
|
||||
if (C->max_vector_size() > 16)
|
||||
// Scheduling code works only with pairs (8 bytes) maximum.
|
||||
if (C->max_vector_size() > 8)
|
||||
return;
|
||||
|
||||
Compile::TracePhase tp("isched", &timers[_t_instrSched]);
|
||||
|
@ -1,319 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2015, 2019, 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 org.graalvm.compiler.hotspot.test;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import org.graalvm.compiler.core.test.GraalCompilerTest;
|
||||
import org.graalvm.compiler.debug.DebugContext;
|
||||
import org.graalvm.compiler.graph.Node;
|
||||
import org.graalvm.compiler.nodes.Invoke;
|
||||
import org.graalvm.compiler.nodes.StructuredGraph;
|
||||
import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
|
||||
import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
|
||||
import org.graalvm.compiler.api.test.ModuleSupport;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.MethodVisitor;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
|
||||
import jdk.vm.ci.meta.ResolvedJavaMethod;
|
||||
|
||||
public class ConstantPoolSubstitutionsTests extends GraalCompilerTest {
|
||||
|
||||
public ConstantPoolSubstitutionsTests() {
|
||||
exportPackage(JAVA_BASE, "jdk.internal.org.objectweb.asm");
|
||||
}
|
||||
|
||||
@SuppressWarnings("try")
|
||||
protected StructuredGraph test(final String snippet) {
|
||||
ResolvedJavaMethod method = getMetaAccess().lookupJavaMethod(getMethod(snippet));
|
||||
DebugContext debug = getDebugContext();
|
||||
try (DebugContext.Scope s = debug.scope("ConstantPoolSubstitutionsTests", method)) {
|
||||
StructuredGraph graph = parseEager(snippet, AllowAssumptions.YES);
|
||||
compile(graph.method(), graph);
|
||||
assertNotInGraph(graph, Invoke.class);
|
||||
debug.dump(DebugContext.BASIC_LEVEL, graph, snippet);
|
||||
return graph;
|
||||
} catch (Throwable e) {
|
||||
throw debug.handle(e);
|
||||
}
|
||||
}
|
||||
|
||||
protected static StructuredGraph assertNotInGraph(StructuredGraph graph, Class<?> clazz) {
|
||||
for (Node node : graph.getNodes()) {
|
||||
if (clazz.isInstance(node)) {
|
||||
fail(node.toString());
|
||||
}
|
||||
}
|
||||
return graph;
|
||||
}
|
||||
|
||||
private static String getMiscPackage() {
|
||||
if (JavaVersionUtil.JAVA_SPEC <= 8) {
|
||||
return "sun.misc";
|
||||
}
|
||||
try {
|
||||
String miscPackage = "jdk.internal.access";
|
||||
Class.forName(miscPackage + ".SharedSecrets");
|
||||
return miscPackage;
|
||||
} catch (ClassNotFoundException e) {
|
||||
try {
|
||||
String miscPackage = "jdk.internal.misc";
|
||||
Class.forName(miscPackage + ".SharedSecrets");
|
||||
return miscPackage;
|
||||
} catch (ClassNotFoundException ex) {
|
||||
}
|
||||
throw new AssertionError(e);
|
||||
}
|
||||
}
|
||||
|
||||
private static Object getConstantPoolForObject() {
|
||||
String miscPackage = getMiscPackage();
|
||||
try {
|
||||
Class<?> sharedSecretsClass = Class.forName(miscPackage + ".SharedSecrets");
|
||||
Class<?> javaLangAccessClass = Class.forName(miscPackage + ".JavaLangAccess");
|
||||
Object jla = sharedSecretsClass.getDeclaredMethod("getJavaLangAccess").invoke(null);
|
||||
return javaLangAccessClass.getDeclaredMethod("getConstantPool", Class.class).invoke(jla, Object.class);
|
||||
} catch (Exception e) {
|
||||
throw new AssertionError(e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the test methods from the generated class.
|
||||
*/
|
||||
@Override
|
||||
protected Method getMethod(String methodName) {
|
||||
Class<?> cl;
|
||||
try {
|
||||
cl = LOADER.findClass(AsmLoader.NAME);
|
||||
addExports(cl);
|
||||
} catch (ClassNotFoundException e) {
|
||||
throw new AssertionError(e);
|
||||
}
|
||||
return getMethod(cl, methodName);
|
||||
}
|
||||
|
||||
@BeforeClass
|
||||
public static void beforeClass() {
|
||||
addExports(AsmLoader.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* This test uses some non-public API.
|
||||
*/
|
||||
private static void addExports(Class<?> c) {
|
||||
ModuleSupport.exportPackageTo(String.class, getMiscPackage(), c);
|
||||
ModuleSupport.exportPackageTo(String.class, "jdk.internal.reflect", c);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetSize() {
|
||||
Object cp = getConstantPoolForObject();
|
||||
test("getSize", cp);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetIntAt() {
|
||||
test("getIntAt");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetLongAt() {
|
||||
test("getLongAt");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetFloatAt() {
|
||||
test("getFloatAt");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetDoubleAt() {
|
||||
test("getDoubleAt");
|
||||
}
|
||||
|
||||
private static final String PACKAGE_NAME = ConstantPoolSubstitutionsTests.class.getPackage().getName();
|
||||
private static final String PACKAGE_NAME_INTERNAL = PACKAGE_NAME.replace('.', '/');
|
||||
|
||||
private static AsmLoader LOADER = new AsmLoader(ConstantPoolSubstitutionsTests.class.getClassLoader());
|
||||
|
||||
public static class AsmLoader extends ClassLoader {
|
||||
Class<?> loaded;
|
||||
|
||||
static final String NAME = PACKAGE_NAME + ".ConstantPoolTest";
|
||||
|
||||
public AsmLoader(ClassLoader parent) {
|
||||
super(parent);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Class<?> findClass(String name) throws ClassNotFoundException {
|
||||
if (name.equals(NAME)) {
|
||||
if (loaded != null) {
|
||||
return loaded;
|
||||
}
|
||||
byte[] bytes = Gen.generateClass();
|
||||
return (loaded = defineClass(name, bytes, 0, bytes.length));
|
||||
} else {
|
||||
return super.findClass(name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static class Gen implements Opcodes {
|
||||
// @formatter:off
|
||||
/*
|
||||
static class ConstantPoolTest {
|
||||
public static int getSize(Object o) {
|
||||
ConstantPool cp = (ConstantPool) o;
|
||||
return cp.getSize();
|
||||
}
|
||||
|
||||
public static int getIntAt(Object o) {
|
||||
ConstantPool cp = (ConstantPool) o;
|
||||
return cp.getIntAt(0);
|
||||
}
|
||||
|
||||
public static long getLongAt(Object o) {
|
||||
ConstantPool cp = (ConstantPool) o;
|
||||
return cp.getLongAt(0);
|
||||
}
|
||||
|
||||
public static float getFloatAt(Object o) {
|
||||
ConstantPool cp = (ConstantPool) o;
|
||||
return cp.getFloatAt(0);
|
||||
}
|
||||
|
||||
public static double getDoubleAt(Object o) {
|
||||
ConstantPool cp = (ConstantPool) o;
|
||||
return cp.getDoubleAt(0);
|
||||
}
|
||||
|
||||
public static String getUTF8At(Object o) {
|
||||
ConstantPool cp = (ConstantPool) o;
|
||||
return cp.getUTF8At(0);
|
||||
}
|
||||
}
|
||||
*/
|
||||
// @formatter:on
|
||||
|
||||
static byte[] generateClass() {
|
||||
|
||||
ClassWriter cw = new ClassWriter(0);
|
||||
MethodVisitor mv;
|
||||
|
||||
cw.visit(52, ACC_SUPER, PACKAGE_NAME_INTERNAL + "/ConstantPoolTest", null, "java/lang/Object", null);
|
||||
cw.visitInnerClass(PACKAGE_NAME_INTERNAL + "/ConstantPoolTest", PACKAGE_NAME_INTERNAL + "/ConstantPoolSubstitutionsTests", "ConstantPoolTest",
|
||||
ACC_STATIC);
|
||||
String constantPool = JavaVersionUtil.JAVA_SPEC <= 8 ? "sun/reflect/ConstantPool" : "jdk/internal/reflect/ConstantPool";
|
||||
|
||||
mv = cw.visitMethod(0, "<init>", "()V", null, null);
|
||||
mv.visitCode();
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
|
||||
mv.visitInsn(RETURN);
|
||||
mv.visitMaxs(1, 1);
|
||||
mv.visitEnd();
|
||||
|
||||
mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "getSize", "(Ljava/lang/Object;)I", null, null);
|
||||
mv.visitCode();
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitTypeInsn(CHECKCAST, constantPool);
|
||||
mv.visitVarInsn(ASTORE, 1);
|
||||
mv.visitVarInsn(ALOAD, 1);
|
||||
mv.visitMethodInsn(INVOKEVIRTUAL, constantPool, "getSize", "()I", false);
|
||||
mv.visitInsn(IRETURN);
|
||||
mv.visitMaxs(1, 3);
|
||||
mv.visitEnd();
|
||||
|
||||
mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "getIntAt", "(Ljava/lang/Object;)I", null, null);
|
||||
mv.visitCode();
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitTypeInsn(CHECKCAST, constantPool);
|
||||
mv.visitVarInsn(ASTORE, 1);
|
||||
mv.visitVarInsn(ALOAD, 1);
|
||||
mv.visitInsn(ICONST_0);
|
||||
mv.visitMethodInsn(INVOKEVIRTUAL, constantPool, "getIntAt", "(I)I", false);
|
||||
mv.visitInsn(IRETURN);
|
||||
mv.visitMaxs(2, 3);
|
||||
mv.visitEnd();
|
||||
|
||||
mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "getLongAt", "(Ljava/lang/Object;)J", null, null);
|
||||
mv.visitCode();
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitTypeInsn(CHECKCAST, constantPool);
|
||||
mv.visitVarInsn(ASTORE, 1);
|
||||
mv.visitVarInsn(ALOAD, 1);
|
||||
mv.visitInsn(ICONST_0);
|
||||
mv.visitMethodInsn(INVOKEVIRTUAL, constantPool, "getLongAt", "(I)J", false);
|
||||
mv.visitInsn(LRETURN);
|
||||
mv.visitMaxs(2, 3);
|
||||
mv.visitEnd();
|
||||
|
||||
mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "getFloatAt", "(Ljava/lang/Object;)F", null, null);
|
||||
mv.visitCode();
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitTypeInsn(CHECKCAST, constantPool);
|
||||
mv.visitVarInsn(ASTORE, 1);
|
||||
mv.visitVarInsn(ALOAD, 1);
|
||||
mv.visitInsn(ICONST_0);
|
||||
mv.visitMethodInsn(INVOKEVIRTUAL, constantPool, "getFloatAt", "(I)F", false);
|
||||
mv.visitInsn(FRETURN);
|
||||
mv.visitMaxs(2, 3);
|
||||
mv.visitEnd();
|
||||
|
||||
mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "getDoubleAt", "(Ljava/lang/Object;)D", null, null);
|
||||
mv.visitCode();
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitTypeInsn(CHECKCAST, constantPool);
|
||||
mv.visitVarInsn(ASTORE, 1);
|
||||
mv.visitVarInsn(ALOAD, 1);
|
||||
mv.visitInsn(ICONST_0);
|
||||
mv.visitMethodInsn(INVOKEVIRTUAL, constantPool, "getDoubleAt", "(I)D", false);
|
||||
mv.visitInsn(DRETURN);
|
||||
mv.visitMaxs(2, 3);
|
||||
mv.visitEnd();
|
||||
|
||||
mv = cw.visitMethod(ACC_PUBLIC | ACC_STATIC, "getUTF8At", "(Ljava/lang/Object;)Ljava/lang/String;", null, null);
|
||||
mv.visitCode();
|
||||
mv.visitVarInsn(ALOAD, 0);
|
||||
mv.visitTypeInsn(CHECKCAST, constantPool);
|
||||
mv.visitVarInsn(ASTORE, 1);
|
||||
mv.visitVarInsn(ALOAD, 1);
|
||||
mv.visitInsn(ICONST_0);
|
||||
mv.visitMethodInsn(INVOKEVIRTUAL, constantPool, "getUTF8At", "(I)Ljava/lang/String;", false);
|
||||
mv.visitInsn(ARETURN);
|
||||
mv.visitMaxs(2, 3);
|
||||
mv.visitEnd();
|
||||
cw.visitEnd();
|
||||
|
||||
return cw.toByteArray();
|
||||
}
|
||||
}
|
||||
}
|
@ -58,7 +58,6 @@ import org.graalvm.compiler.hotspot.replacements.CRC32CSubstitutions;
|
||||
import org.graalvm.compiler.hotspot.replacements.CRC32Substitutions;
|
||||
import org.graalvm.compiler.hotspot.replacements.CallSiteTargetNode;
|
||||
import org.graalvm.compiler.hotspot.replacements.CipherBlockChainingSubstitutions;
|
||||
import org.graalvm.compiler.hotspot.replacements.ClassGetHubNode;
|
||||
import org.graalvm.compiler.hotspot.replacements.CounterModeSubstitutions;
|
||||
import org.graalvm.compiler.hotspot.replacements.DigestBaseSubstitutions;
|
||||
import org.graalvm.compiler.hotspot.replacements.FastNotifyNode;
|
||||
@ -76,12 +75,9 @@ import org.graalvm.compiler.hotspot.replacements.ThreadSubstitutions;
|
||||
import org.graalvm.compiler.hotspot.word.HotSpotWordTypes;
|
||||
import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
|
||||
import org.graalvm.compiler.nodes.ConstantNode;
|
||||
import org.graalvm.compiler.nodes.NamedLocationIdentity;
|
||||
import org.graalvm.compiler.nodes.NodeView;
|
||||
import org.graalvm.compiler.nodes.ValueNode;
|
||||
import org.graalvm.compiler.nodes.calc.AddNode;
|
||||
import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
|
||||
import org.graalvm.compiler.nodes.calc.LeftShiftNode;
|
||||
import org.graalvm.compiler.nodes.extended.ForeignCallNode;
|
||||
import org.graalvm.compiler.nodes.graphbuilderconf.ForeignCallPlugin;
|
||||
import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginFactory;
|
||||
@ -109,11 +105,8 @@ import org.graalvm.compiler.replacements.arraycopy.ArrayCopyNode;
|
||||
import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams;
|
||||
import org.graalvm.compiler.serviceprovider.GraalServices;
|
||||
import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
|
||||
import org.graalvm.compiler.word.WordOperationPlugin;
|
||||
import org.graalvm.compiler.word.WordTypes;
|
||||
import jdk.internal.vm.compiler.word.LocationIdentity;
|
||||
|
||||
import jdk.vm.ci.code.CodeUtil;
|
||||
import jdk.vm.ci.code.TargetDescription;
|
||||
import jdk.vm.ci.hotspot.VMIntrinsicMethod;
|
||||
import jdk.vm.ci.meta.ConstantReflectionProvider;
|
||||
@ -191,7 +184,6 @@ public class HotSpotGraphBuilderPlugins {
|
||||
registerCallSitePlugins(invocationPlugins);
|
||||
}
|
||||
registerReflectionPlugins(invocationPlugins, replacements);
|
||||
registerConstantPoolPlugins(invocationPlugins, wordTypes, config, replacements);
|
||||
registerAESPlugins(invocationPlugins, config, replacements);
|
||||
registerCRC32Plugins(invocationPlugins, config, replacements);
|
||||
registerCRC32CPlugins(invocationPlugins, config, replacements);
|
||||
@ -381,85 +373,6 @@ public class HotSpotGraphBuilderPlugins {
|
||||
});
|
||||
}
|
||||
|
||||
private static final LocationIdentity INSTANCE_KLASS_CONSTANTS = NamedLocationIdentity.immutable("InstanceKlass::_constants");
|
||||
private static final LocationIdentity CONSTANT_POOL_LENGTH = NamedLocationIdentity.immutable("ConstantPool::_length");
|
||||
|
||||
/**
|
||||
* Emits a node to get the metaspace {@code ConstantPool} pointer given the value of the
|
||||
* {@code constantPoolOop} field in a ConstantPool value.
|
||||
*
|
||||
* @param constantPoolOop value of the {@code constantPoolOop} field in a ConstantPool value
|
||||
* @return a node representing the metaspace {@code ConstantPool} pointer associated with
|
||||
* {@code constantPoolOop}
|
||||
*/
|
||||
private static ValueNode getMetaspaceConstantPool(GraphBuilderContext b, ValueNode constantPoolOop, WordTypes wordTypes, GraalHotSpotVMConfig config) {
|
||||
// ConstantPool.constantPoolOop is in fact the holder class.
|
||||
ValueNode value = b.nullCheckedValue(constantPoolOop, DeoptimizationAction.None);
|
||||
ValueNode klass = b.add(ClassGetHubNode.create(value, b.getMetaAccess(), b.getConstantReflection(), false));
|
||||
|
||||
boolean notCompressible = false;
|
||||
AddressNode constantsAddress = b.add(new OffsetAddressNode(klass, b.add(ConstantNode.forLong(config.instanceKlassConstantsOffset))));
|
||||
return WordOperationPlugin.readOp(b, wordTypes.getWordKind(), constantsAddress, INSTANCE_KLASS_CONSTANTS, BarrierType.NONE, notCompressible);
|
||||
}
|
||||
|
||||
/**
|
||||
* Emits a node representing an element in a metaspace {@code ConstantPool}.
|
||||
*
|
||||
* @param constantPoolOop value of the {@code constantPoolOop} field in a ConstantPool value
|
||||
*/
|
||||
private static boolean readMetaspaceConstantPoolElement(GraphBuilderContext b, ValueNode constantPoolOop, ValueNode index, JavaKind elementKind, WordTypes wordTypes, GraalHotSpotVMConfig config) {
|
||||
ValueNode constants = getMetaspaceConstantPool(b, constantPoolOop, wordTypes, config);
|
||||
int shift = CodeUtil.log2(wordTypes.getWordKind().getByteCount());
|
||||
ValueNode scaledIndex = b.add(new LeftShiftNode(IntegerConvertNode.convert(index, StampFactory.forKind(JavaKind.Long), NodeView.DEFAULT), b.add(ConstantNode.forInt(shift))));
|
||||
ValueNode offset = b.add(new AddNode(scaledIndex, b.add(ConstantNode.forLong(config.constantPoolSize))));
|
||||
AddressNode elementAddress = b.add(new OffsetAddressNode(constants, offset));
|
||||
boolean notCompressible = false;
|
||||
ValueNode elementValue = WordOperationPlugin.readOp(b, elementKind, elementAddress, NamedLocationIdentity.getArrayLocation(elementKind), BarrierType.NONE, notCompressible);
|
||||
b.addPush(elementKind, elementValue);
|
||||
return true;
|
||||
}
|
||||
|
||||
private static void registerConstantPoolPlugins(InvocationPlugins plugins, WordTypes wordTypes, GraalHotSpotVMConfig config, Replacements replacements) {
|
||||
Registration r = new Registration(plugins, constantPoolClass, replacements);
|
||||
|
||||
r.register2("getSize0", Receiver.class, Object.class, new InvocationPlugin() {
|
||||
@Override
|
||||
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode constantPoolOop) {
|
||||
boolean notCompressible = false;
|
||||
ValueNode constants = getMetaspaceConstantPool(b, constantPoolOop, wordTypes, config);
|
||||
AddressNode lengthAddress = b.add(new OffsetAddressNode(constants, b.add(ConstantNode.forLong(config.constantPoolLengthOffset))));
|
||||
ValueNode length = WordOperationPlugin.readOp(b, JavaKind.Int, lengthAddress, CONSTANT_POOL_LENGTH, BarrierType.NONE, notCompressible);
|
||||
b.addPush(JavaKind.Int, length);
|
||||
return true;
|
||||
}
|
||||
});
|
||||
|
||||
r.register3("getIntAt0", Receiver.class, Object.class, int.class, new InvocationPlugin() {
|
||||
@Override
|
||||
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode constantPoolOop, ValueNode index) {
|
||||
return readMetaspaceConstantPoolElement(b, constantPoolOop, index, JavaKind.Int, wordTypes, config);
|
||||
}
|
||||
});
|
||||
r.register3("getLongAt0", Receiver.class, Object.class, int.class, new InvocationPlugin() {
|
||||
@Override
|
||||
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode constantPoolOop, ValueNode index) {
|
||||
return readMetaspaceConstantPoolElement(b, constantPoolOop, index, JavaKind.Long, wordTypes, config);
|
||||
}
|
||||
});
|
||||
r.register3("getFloatAt0", Receiver.class, Object.class, int.class, new InvocationPlugin() {
|
||||
@Override
|
||||
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode constantPoolOop, ValueNode index) {
|
||||
return readMetaspaceConstantPoolElement(b, constantPoolOop, index, JavaKind.Float, wordTypes, config);
|
||||
}
|
||||
});
|
||||
r.register3("getDoubleAt0", Receiver.class, Object.class, int.class, new InvocationPlugin() {
|
||||
@Override
|
||||
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode constantPoolOop, ValueNode index) {
|
||||
return readMetaspaceConstantPoolElement(b, constantPoolOop, index, JavaKind.Double, wordTypes, config);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private static void registerSystemPlugins(InvocationPlugins plugins) {
|
||||
Registration r = new Registration(plugins, System.class);
|
||||
r.register0("currentTimeMillis", new ForeignCallPlugin(HotSpotHostForeignCallsProvider.JAVA_TIME_MILLIS));
|
||||
@ -526,15 +439,12 @@ public class HotSpotGraphBuilderPlugins {
|
||||
}
|
||||
|
||||
public static final String reflectionClass;
|
||||
public static final String constantPoolClass;
|
||||
|
||||
static {
|
||||
if (JavaVersionUtil.JAVA_SPEC <= 8) {
|
||||
reflectionClass = "sun.reflect.Reflection";
|
||||
constantPoolClass = "sun.reflect.ConstantPool";
|
||||
} else {
|
||||
reflectionClass = "jdk.internal.reflect.Reflection";
|
||||
constantPoolClass = "jdk.internal.reflect.ConstantPool";
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -35,7 +35,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.anonloader.func.castToGrandparent.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2010, 2020, 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
|
||||
@ -38,7 +38,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
* @ignore 8199227
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
|
@ -37,7 +37,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.anonloader.func.classNameInStackTrace.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -36,7 +36,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.anonloader.share.ReplaceClassParentTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2010, 2020, 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
|
||||
@ -35,7 +35,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.anonloader.func.findByName.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2010, 2020, 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
|
||||
@ -31,7 +31,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.anonloader.func.invalidSuperclass.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2010, 2020, 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
|
||||
@ -36,7 +36,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.anonloader.func.isGarbageCollected.Test
|
||||
|
@ -37,7 +37,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.anonloader.func.uniqueClassAndObject.Test
|
||||
|
@ -32,7 +32,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.anonloader.stress.byteMutation.Test
|
||||
|
@ -32,7 +32,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.anonloader.stress.oome.heap.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2010, 2020, 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
|
||||
@ -31,7 +31,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.anonloader.stress.oome.metaspace.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2010, 2020, 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
|
||||
@ -31,7 +31,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.anonloader.stress.parallelLoad.Test
|
||||
|
@ -32,7 +32,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.anonloader.stress.randomBytecodes.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -44,7 +44,6 @@
|
||||
* @comment build generator
|
||||
* @build vm.mlvm.cp.share.GenManyIndyCorrectBootstrap
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.share.ClassfileGeneratorTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -45,7 +45,6 @@
|
||||
* @comment build generator
|
||||
* @build vm.mlvm.cp.share.GenManyIndyIncorrectBootstrap
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.share.ClassfileGeneratorTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -44,7 +44,6 @@
|
||||
* @comment build generator
|
||||
* @build vm.mlvm.cp.share.GenManyIndyOneCPX
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
* @ignore 8199227
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -44,7 +44,6 @@
|
||||
* @comment build generator
|
||||
* @build vm.mlvm.cp.share.GenCPFullOfMH
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.share.ClassfileGeneratorTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -44,7 +44,6 @@
|
||||
* @comment build generator
|
||||
* @build vm.mlvm.cp.share.GenCPFullOfMT
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.share.ClassfileGeneratorTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -36,7 +36,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
* @ignore 8199227
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -57,7 +57,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.java.thisAsArgument.INDIFY_Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -33,7 +33,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.java.verifyStackTrace.INDIFY_Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2016, 2020, 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
|
||||
@ -35,7 +35,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build debuggee class
|
||||
* @build vm.mlvm.share.jdi.IndyDebuggee
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2016, 2020, 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
|
||||
@ -35,7 +35,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build debuggee class
|
||||
* @build vm.mlvm.share.jdi.IndyDebuggee
|
||||
|
3
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_a/TestDescription.java
3
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_a/TestDescription.java
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -49,7 +49,6 @@
|
||||
* @run driver nsk.share.ExtraClassesBuilder newclass
|
||||
* @run driver vm.mlvm.share.IndifiedClassesBuilder bin/newclass
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.jvmti.share.IndyRedefineTest
|
||||
|
3
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_b/TestDescription.java
3
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_b/TestDescription.java
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -50,7 +50,6 @@
|
||||
* @run driver nsk.share.ExtraClassesBuilder newclass
|
||||
* @run driver vm.mlvm.share.IndifiedClassesBuilder bin/newclass
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.jvmti.share.IndyRedefineTest
|
||||
|
3
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_a/TestDescription.java
3
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_a/TestDescription.java
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -49,7 +49,6 @@
|
||||
* @run driver nsk.share.ExtraClassesBuilder newclass
|
||||
* @run driver vm.mlvm.share.IndifiedClassesBuilder bin/newclass
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.jvmti.share.IndyRedefineTest
|
||||
|
3
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_b/TestDescription.java
3
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_b/TestDescription.java
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -50,7 +50,6 @@
|
||||
* @run driver nsk.share.ExtraClassesBuilder newclass
|
||||
* @run driver vm.mlvm.share.IndifiedClassesBuilder bin/newclass
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.jvmti.share.IndyRedefineTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -50,7 +50,6 @@
|
||||
* @run driver nsk.share.ExtraClassesBuilder newclass
|
||||
* @run driver vm.mlvm.share.IndifiedClassesBuilder bin/newclass
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.jvmti.share.IndyRedefineTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -49,7 +49,6 @@
|
||||
* @run driver nsk.share.ExtraClassesBuilder newclass
|
||||
* @run driver vm.mlvm.share.IndifiedClassesBuilder bin/newclass
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.jvmti.share.IndyRedefineTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -49,7 +49,6 @@
|
||||
* @run driver nsk.share.ExtraClassesBuilder newclass
|
||||
* @run driver vm.mlvm.share.IndifiedClassesBuilder bin/newclass
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.jvmti.share.IndyRedefineTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -49,7 +49,6 @@
|
||||
* @run driver nsk.share.ExtraClassesBuilder newclass
|
||||
* @run driver vm.mlvm.share.IndifiedClassesBuilder bin/newclass
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.jvmti.share.IndyRedefineTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -49,7 +49,6 @@
|
||||
* @run driver nsk.share.ExtraClassesBuilder newclass
|
||||
* @run driver vm.mlvm.share.IndifiedClassesBuilder bin/newclass
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.jvmti.share.IndyRedefineTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -49,7 +49,6 @@
|
||||
* @run driver nsk.share.ExtraClassesBuilder newclass
|
||||
* @run driver vm.mlvm.share.IndifiedClassesBuilder bin/newclass
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.jvmti.share.IndyRedefineTest
|
||||
|
3
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInBootstrap/TestDescription.java
3
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/redefineClassInBootstrap/TestDescription.java
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -49,7 +49,6 @@
|
||||
* @run driver nsk.share.ExtraClassesBuilder newclass
|
||||
* @run driver vm.mlvm.share.IndifiedClassesBuilder bin/newclass
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.jvmti.share.IndyRedefineTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -49,7 +49,6 @@
|
||||
* @run driver nsk.share.ExtraClassesBuilder newclass
|
||||
* @run driver vm.mlvm.share.IndifiedClassesBuilder bin/newclass
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.jvmti.share.IndyRedefineTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -39,7 +39,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.func.jvmti.stepBreakPopReturn.INDIFY_Test
|
||||
|
@ -30,7 +30,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
* @build sun.hotspot.WhiteBox
|
||||
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
|
||||
*
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -34,7 +34,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.stress.java.loopsAndThreads.INDIFY_Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -42,7 +42,6 @@
|
||||
* @comment build actor
|
||||
* @build vm.mlvm.indy.stress.java.mutableCallSiteDekker.Actor
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.share.DekkerTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -41,7 +41,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.stress.java.relinkMutableCallSite.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -30,7 +30,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.stress.java.relinkMutableCallSiteFreq.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -41,7 +41,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.stress.java.relinkVolatileCallSite.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -30,7 +30,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.indy.stress.java.relinkVolatileCallSiteFreq.Test
|
||||
|
3
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/stress/java/volatileCallSiteDekker/TestDescription.java
3
test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/stress/java/volatileCallSiteDekker/TestDescription.java
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -40,7 +40,6 @@
|
||||
* @comment build actor
|
||||
* @build vm.mlvm.indy.stress.java.volatileCallSiteDekker.Actor
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.share.DekkerTest
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2016, 2020, 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
|
||||
@ -34,7 +34,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build debuggee class
|
||||
* @build vm.mlvm.share.jdi.IndyDebuggee
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -36,7 +36,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.meth.func.java.throwException.Test
|
||||
|
@ -35,7 +35,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build debuggee class
|
||||
* @build vm.mlvm.share.jdi.MHDebuggee
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2016, 2020, 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
|
||||
@ -35,7 +35,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build debuggee class
|
||||
* @build vm.mlvm.share.jdi.MHDebuggee
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -35,7 +35,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.mixed.func.regression.b7087658.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -39,7 +39,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.mixed.func.regression.b7127687.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -34,7 +34,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.mixed.func.regression.b7129034.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -37,7 +37,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.meth.stress.compiler.deoptimize.Test
|
||||
@ -59,7 +58,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.meth.stress.compiler.deoptimize.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -45,7 +45,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.meth.stress.compiler.i2c_c2i.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -35,7 +35,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.meth.stress.compiler.inlineMHTarget.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -36,7 +36,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.meth.stress.compiler.sequences.Test
|
||||
|
@ -40,7 +40,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.meth.stress.gc.callSequencesDuringGC.Test
|
||||
|
@ -36,7 +36,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.meth.stress.gc.createLotsOfMH.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -44,7 +44,6 @@
|
||||
* @comment build generator
|
||||
* @build vm.mlvm.cp.share.GenCPFullOfMH
|
||||
*
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.meth.stress.gc.createLotsOfMHConsts.Test
|
||||
|
@ -43,7 +43,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.meth.stress.java.sequences.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2016, 2020, 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
|
||||
@ -35,7 +35,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build debuggee class
|
||||
* @build vm.mlvm.share.jdi.MHDebuggee
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -35,7 +35,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.meth.stress.jni.nativeAndMH.Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
@ -39,7 +39,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.mixed.stress.java.findDeadlock.INDIFY_Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2020, 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
|
||||
@ -31,7 +31,6 @@
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @run driver jdk.test.lib.FileInstaller . .
|
||||
*
|
||||
* @comment build test class and indify classes
|
||||
* @build vm.mlvm.mixed.stress.regression.b6969574.INDIFY_Test
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2017, 2020, 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
|
||||
@ -29,11 +29,13 @@ import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
|
||||
import jdk.test.lib.util.JarBuilder;
|
||||
/*
|
||||
* @test
|
||||
* @bug 8174151
|
||||
* @summary Test for java.protocol.handler.pkgs with jar protocol handler
|
||||
* @library /lib/testlibrary/java/util/jar
|
||||
* @library /test/lib/
|
||||
* @build jdk.test.lib.util.JarBuilder
|
||||
* @compile handlers/jar/Handler.java
|
||||
* @run main/othervm -Djava.protocol.handler.pkgs=handlers JarHandlerPkgPrefix
|
||||
*/
|
||||
@ -62,4 +64,5 @@ public class JarHandlerPkgPrefix {
|
||||
Files.delete(jarPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2017, 2020, 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
|
||||
@ -21,14 +21,13 @@
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/**
|
||||
/*
|
||||
* @test
|
||||
* @bug 8186334
|
||||
* @library /lib/testlibrary/java/util/jar
|
||||
* @build JarBuilder
|
||||
* @summary Make sure scanning manifest doesn't throw AIOOBE on certain strings containing backticks.
|
||||
* @library /test/lib/
|
||||
* @build jdk.test.lib.util.JarBuilder
|
||||
* @run testng JarBacktickManifest
|
||||
* @summary Make sure scanning manifest doesn't throw AIOOBE on certain strings
|
||||
* containing backticks.
|
||||
*/
|
||||
|
||||
import java.io.File;
|
||||
@ -41,6 +40,8 @@ import org.testng.annotations.AfterClass;
|
||||
import org.testng.annotations.BeforeClass;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import jdk.test.lib.util.JarBuilder;
|
||||
|
||||
public class JarBacktickManifest {
|
||||
|
||||
public static final String VERIFY_MANIFEST_JAR = "verifyManifest.jar";
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015, 2020, 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
|
||||
@ -28,7 +28,9 @@
|
||||
* support multi-release jar files
|
||||
* @library /lib/testlibrary/java/util/jar /test/lib
|
||||
* @build jdk.test.lib.RandomFactory
|
||||
* Compiler JarBuilder CreateMultiReleaseTestJars
|
||||
* CreateMultiReleaseTestJars
|
||||
* jdk.test.lib.compiler.Compiler
|
||||
* jdk.test.lib.util.JarBuilder
|
||||
* @run testng MultiReleaseJarAPI
|
||||
*/
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015, 2020, 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
|
||||
@ -29,7 +29,10 @@
|
||||
* @modules jdk.jartool
|
||||
* jdk.compiler
|
||||
* jdk.httpserver
|
||||
* @build Compiler JarBuilder CreateMultiReleaseTestJars SimpleHttpServer
|
||||
* @build CreateMultiReleaseTestJars
|
||||
* SimpleHttpServer
|
||||
* jdk.test.lib.compiler.Compiler
|
||||
* jdk.test.lib.util.JarBuilder
|
||||
* @run testng MultiReleaseJarHttpProperties
|
||||
* @run testng/othervm -Djdk.util.jar.version=0 MultiReleaseJarHttpProperties
|
||||
* @run testng/othervm -Djdk.util.jar.version=8 MultiReleaseJarHttpProperties
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015, 2020, 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
|
||||
@ -25,8 +25,10 @@
|
||||
* @test
|
||||
* @bug 8132734 8144062 8194070
|
||||
* @summary Test the System properties for JarFile that support multi-release jar files
|
||||
* @library /lib/testlibrary/java/util/jar
|
||||
* @build Compiler JarBuilder CreateMultiReleaseTestJars
|
||||
* @library /lib/testlibrary/java/util/jar /test/lib/
|
||||
* @build CreateMultiReleaseTestJars
|
||||
* jdk.test.lib.compiler.Compiler
|
||||
* jdk.test.lib.util.JarBuilder
|
||||
* @run testng MultiReleaseJarProperties
|
||||
* @run testng/othervm -Djdk.util.jar.version=0 MultiReleaseJarProperties
|
||||
* @run testng/othervm -Djdk.util.jar.version=8 MultiReleaseJarProperties
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015, 2020, 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
|
||||
@ -25,8 +25,10 @@
|
||||
* @test
|
||||
* @bug 8132734 8144062
|
||||
* @summary Test potential security related issues
|
||||
* @library /lib/testlibrary/java/util/jar
|
||||
* @build Compiler JarBuilder CreateMultiReleaseTestJars
|
||||
* @library /lib/testlibrary/java/util/jar /test/lib/
|
||||
* @build CreateMultiReleaseTestJars
|
||||
* jdk.test.lib.compiler.Compiler
|
||||
* jdk.test.lib.util.JarBuilder
|
||||
* @run testng MultiReleaseJarSecurity
|
||||
*/
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2016, 2020, 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
|
||||
@ -25,10 +25,11 @@
|
||||
* @test
|
||||
* @bug 8164389 8222440
|
||||
* @summary walk entries in a multi-release jar file via jdk.zipfs
|
||||
* @library /lib/testlibrary/java/util/jar
|
||||
* @modules jdk.jartool
|
||||
* jdk.zipfs
|
||||
* @build Compiler JarBuilder
|
||||
* @library /test/lib/
|
||||
* @build jdk.test.lib.util.JarBuilder
|
||||
* jdk.test.lib.compiler.Compiler
|
||||
* @run testng JFSTester
|
||||
*/
|
||||
|
||||
@ -49,6 +50,8 @@ import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import jdk.test.lib.util.JarBuilder;
|
||||
|
||||
public class JFSTester {
|
||||
private URI jarURI;
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015, 2020, 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
|
||||
@ -25,11 +25,13 @@
|
||||
* @test
|
||||
* @bug 8144355 8144062 8176709 8194070 8193802 8231093
|
||||
* @summary Test aliasing additions to ZipFileSystem for multi-release jar files
|
||||
* @library /lib/testlibrary/java/util/jar
|
||||
* @library /lib/testlibrary/java/util/jar /test/lib/
|
||||
* @modules jdk.compiler
|
||||
* jdk.jartool
|
||||
* jdk.zipfs
|
||||
* @build Compiler JarBuilder CreateMultiReleaseTestJars
|
||||
* @build CreateMultiReleaseTestJars
|
||||
* jdk.test.lib.util.JarBuilder
|
||||
* jdk.test.lib.compiler.Compiler
|
||||
* @run testng MultiReleaseJarTest
|
||||
*/
|
||||
|
||||
@ -47,6 +49,7 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import org.testng.Assert;
|
||||
import org.testng.annotations.*;
|
||||
import jdk.test.lib.util.JarBuilder;
|
||||
|
||||
public class MultiReleaseJarTest {
|
||||
final private int MAJOR_VERSION = Runtime.version().feature();
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015, 2020, 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
|
||||
@ -37,6 +37,9 @@ import java.util.Map;
|
||||
import java.util.zip.ZipFile;
|
||||
import jdk.security.jarsigner.JarSigner;
|
||||
|
||||
import jdk.test.lib.util.JarBuilder;
|
||||
import jdk.test.lib.compiler.Compiler;
|
||||
|
||||
public class CreateMultiReleaseTestJars {
|
||||
final private String main =
|
||||
"package version;\n\n"
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015, 2020, 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
|
||||
@ -29,7 +29,10 @@
|
||||
* @modules jdk.compiler
|
||||
* jdk.httpserver
|
||||
* jdk.jartool
|
||||
* @build Compiler JarBuilder CreateMultiReleaseTestJars SimpleHttpServer
|
||||
* @build CreateMultiReleaseTestJars
|
||||
* SimpleHttpServer
|
||||
* jdk.test.lib.util.JarBuilder
|
||||
* jdk.test.lib.compiler.Compiler
|
||||
* @run testng MultiReleaseJarURLConnection
|
||||
*/
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
|
11
test/jdk/lib/testlibrary/java/util/jar/Compiler.java → test/lib/jdk/test/lib/compiler/Compiler.java
11
test/jdk/lib/testlibrary/java/util/jar/Compiler.java → test/lib/jdk/test/lib/compiler/Compiler.java
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015, 2020, 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
|
||||
@ -20,6 +20,7 @@
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
package jdk.test.lib.compiler;
|
||||
|
||||
import javax.tools.*;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
@ -31,15 +32,15 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
class Compiler {
|
||||
public class Compiler {
|
||||
final private Map<String,String> input;
|
||||
private List<String> options;
|
||||
|
||||
Compiler(Map<String,String> input) {
|
||||
public Compiler(Map<String,String> input) {
|
||||
this.input = input;
|
||||
}
|
||||
|
||||
Compiler setRelease(int release) {
|
||||
public Compiler setRelease(int release) {
|
||||
// Setting the -release option does not work for some reason
|
||||
// so do it the old fashioned way
|
||||
// options = Arrays.asList("-release", String.valueOf(release));
|
||||
@ -48,7 +49,7 @@ class Compiler {
|
||||
return this;
|
||||
}
|
||||
|
||||
Map<String,byte[]> compile() {
|
||||
public Map<String,byte[]> compile() {
|
||||
List<SourceFileObject> cunits = createCompilationUnits();
|
||||
Map<String,ClassFileObject> cfos = createClassFileObjects();
|
||||
JavaCompiler jc = ToolProvider.getSystemJavaCompiler();
|
3
test/jdk/lib/testlibrary/java/util/jar/JarBuilder.java → test/lib/jdk/test/lib/util/JarBuilder.java
3
test/jdk/lib/testlibrary/java/util/jar/JarBuilder.java → test/lib/jdk/test/lib/util/JarBuilder.java
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015, 2020, 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
|
||||
@ -20,6 +20,7 @@
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
package jdk.test.lib.util;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
Loading…
x
Reference in New Issue
Block a user