diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/anonloader/share/StressClassLoadingTest.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/anonloader/share/StressClassLoadingTest.java index c86b3c5f028..2c9d96aac76 100644 --- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/anonloader/share/StressClassLoadingTest.java +++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/anonloader/share/StressClassLoadingTest.java @@ -70,12 +70,6 @@ import vm.share.UnsafeAccess; * Class saving is controlled by -saveClassFile option. * A prefix can be added to the file name using {@link #setFileNamePrefix} * function. - * - *

There is a tool to load the saved .class file. - * The tool tries to load class using a number of class loaders. For more - * information, please see tool documentation: {@link vm.mlvm.tools.LoadClass}. - * - * @see vm.mlvm.tools.LoadClass */ public abstract class StressClassLoadingTest extends MlvmTest { private static final String RESCUE_FILE_NAME = "_AnonkTestee01.class"; diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/anonloader/stress/byteMutation/Test.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/anonloader/stress/byteMutation/Test.java index 21e1b9dab2b..305eb6cc408 100644 --- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/anonloader/stress/byteMutation/Test.java +++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/anonloader/stress/byteMutation/Test.java @@ -65,9 +65,6 @@ import vm.share.options.Option; * the VM verifier. But this test tries to find pathological cases, such * as infinite loops during verification or VM crashes. * - *

NB: There is a tool to load invalid classes saved by this test. - * Please see tool documentation at {@link vm.mlvm.tools.LoadClass} - * */ public class Test extends StressClassLoadingTest { private final static Class HOST_CLASS = AnonkTestee01.class; diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/anonloader/stress/randomBytecodes/Test.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/anonloader/stress/randomBytecodes/Test.java index 42e99f51a84..d28525041f6 100644 --- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/anonloader/stress/randomBytecodes/Test.java +++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/anonloader/stress/randomBytecodes/Test.java @@ -62,9 +62,6 @@ import vm.mlvm.anonloader.share.StressClassLoadingTest; * the VM verifier. But this test is looking for pathological cases * such as infinite loops in the verifier or VM crashes. * - *

NB: There is a tool to load invalid classes saved by this test. - * Please see tool documentation at {@link vm.mlvm.tools.LoadClass}. - * */ public class Test extends StressClassLoadingTest { private static final Class HOST_CLASS = Test.class; diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/tools/LoadClass.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/tools/LoadClass.java deleted file mode 100644 index b954ee6e152..00000000000 --- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/tools/LoadClass.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2016, 2018, 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 vm.mlvm.tools; - -import java.io.File; -import vm.share.UnsafeAccess; -import vm.share.FileUtils; -import vm.mlvm.share.CustomClassLoaders; -import vm.mlvm.anonloader.share.AnonkTestee01; - -import vm.mlvm.share.Env; - -/** - * A tool, which loads a class file specified in command line into VM using: - *

- * - *

Syntax: - * 

{@code
- * $ java [options...] vm.mlvm.tool.LoadClass class-file-name [class-FQDN]
- * }
- * - * The first argument, class file name is mandatory. - * The second one is optional — a fully qualified class name. - * If the second argument is not specified, it is constructed from the first - * argument, replacing '/' with '.' - * - *

The tool can be used for investigating failures of vm.mlvm.anon tests. - * - */ -public class LoadClass { - - private static final Class HOST_CLASS = AnonkTestee01.class; - - private static void usage() { - System.out.println("Usage: java " + LoadClass.class.getName() - + " [class-name]"); - } - - /** - * Runs the tool. - * @param args Tool arguments - */ - @SuppressWarnings("deprecation") - public static void main(String[] args) { - if (args.length < 1) { - usage(); - System.exit(1); - } - - try { - final String classFileName = args[0]; - final String className = (args.length > 1) ? args[1] - : classFileName.replaceAll("\\.class$", "") - .replace("/", "."); - final byte[] classBytes = FileUtils - .readFile(new File(classFileName)); - - Env.traceImportant("Loading class '%s' from file '%s'...", - className, classFileName); - - Env.traceImportant("...using custom ClassLoader"); - try { - ClassLoader cl = CustomClassLoaders - .makeClassBytesLoader(classBytes, className); - Class c = cl.loadClass(className); - c.newInstance(); - Env.traceImportant("OK"); - } catch (Throwable e) { - Env.traceImportant(e, - "Couldn't load class '%s' via custom ClassLoader", - classFileName); - } - - Env.traceImportant( - "...using sun.misc.Unsafe.defineAnonymousClass():"); - try { - Class c = UnsafeAccess.unsafe.defineAnonymousClass(HOST_CLASS, - classBytes, new Object[0]); - c.newInstance(); - Env.traceImportant("OK"); - } catch (Throwable e) { - Env.traceImportant(e, "Couldn't load class '%s' via sun.misc." - + "Unsafe.defineAnonymousClass()", classFileName); - } - } catch (Throwable e) { - Env.traceImportant(e, "Can't load class"); - } - } -}