This method does not check whether the requested class is * accessible to its caller.
* - *Note that this method throws errors related to loading and linking as - * specified in Sections 12.2 and 12.3 of The Java Language - * Specification. - * * @apiNote * This method returns {@code null} on failure rather than * throwing a {@link ClassNotFoundException}, as is done by @@ -473,8 +465,6 @@ * in a module. * * - * @jls 12.2 Loading of Classes and Interfaces - * @jls 12.3 Linking of Classes and Interfaces * @since 9 * @spec JPMS */ @@ -498,21 +488,13 @@ cl = module.getClassLoader(); } - Class ret; if (cl != null) { - ret = cl.loadClass(module, name); + return cl.loadClass(module, name); } else { - ret = BootLoader.loadClass(module, name); + return BootLoader.loadClass(module, name); } - if (ret != null) { - // The loaded class should also be linked - linkClass(ret); - } - return ret; } - private static native void linkClass(Class c); - /** * Creates a new instance of the class represented by this {@code Class} * object. The class is instantiated as if by a {@code new} diff -r 1d1f9c43138f -r d67ebc838ab8 src/java.base/share/classes/java/lang/invoke/MethodHandles.java --- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Mon Nov 04 11:05:10 2019 -0800 +++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Mon Nov 04 11:42:24 2019 -0800 @@ -1933,17 +1933,12 @@ } /** - * Looks up a class by name from the lookup context defined by this {@code Lookup} object. - * This method attempts to locate, load, and link the class, and then determines whether - * the class is accessible to this {@code Lookup} object. The static + * Looks up a class by name from the lookup context defined by this {@code Lookup} object. The static * initializer of the class is not run. *
* The lookup context here is determined by the {@linkplain #lookupClass() lookup class}, its class - * loader, and the {@linkplain #lookupModes() lookup modes}. - *
- * Note that this method throws errors related to loading and linking as
- * specified in Sections 12.2 and 12.3 of The Java Language
- * Specification.
+ * loader, and the {@linkplain #lookupModes() lookup modes}. In particular, the method first attempts to
+ * load the requested class, and then determines whether the class is accessible to this lookup object.
*
* @param targetName the fully qualified name of the class to be looked up.
* @return the requested class.
@@ -1955,9 +1950,6 @@
* modes.
* @throws SecurityException if a security manager is present and it
* refuses access
- *
- * @jls 12.2 Loading of Classes and Interfaces
- * @jls 12.3 Linking of Classes and Interfaces
* @since 9
*/
public Class findClass(String targetName) throws ClassNotFoundException, IllegalAccessException {
diff -r 1d1f9c43138f -r d67ebc838ab8 src/java.base/share/classes/sun/launcher/LauncherHelper.java
--- a/src/java.base/share/classes/sun/launcher/LauncherHelper.java Mon Nov 04 11:05:10 2019 -0800
+++ b/src/java.base/share/classes/sun/launcher/LauncherHelper.java Mon Nov 04 11:42:24 2019 -0800
@@ -62,7 +62,6 @@
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.security.AccessControlException;
import java.text.Normalizer;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -725,9 +724,6 @@
} catch (LinkageError le) {
abort(null, "java.launcher.module.error3", mainClass, m.getName(),
le.getClass().getName() + ": " + le.getLocalizedMessage());
- } catch (AccessControlException ace) {
- abort(ace, "java.launcher.module.error5", mainClass, m.getName(),
- ace.getClass().getName(), ace.getLocalizedMessage());
}
if (c == null) {
abort(null, "java.launcher.module.error2", mainClass, mainModule);
@@ -784,9 +780,6 @@
} catch (LinkageError le) {
abort(le, "java.launcher.cls.error6", cn,
le.getClass().getName() + ": " + le.getLocalizedMessage());
- } catch (AccessControlException ace) {
- abort(ace, "java.launcher.cls.error7", cn,
- ace.getClass().getName(), ace.getLocalizedMessage());
}
return mainClass;
}
diff -r 1d1f9c43138f -r d67ebc838ab8 src/java.base/share/native/libjava/Class.c
--- a/src/java.base/share/native/libjava/Class.c Mon Nov 04 11:05:10 2019 -0800
+++ b/src/java.base/share/native/libjava/Class.c Mon Nov 04 11:42:24 2019 -0800
@@ -73,7 +73,6 @@
{"getRawTypeAnnotations", "()" BA, (void *)&JVM_GetClassTypeAnnotations},
{"getNestHost0", "()" CLS, (void *)&JVM_GetNestHost},
{"getNestMembers0", "()[" CLS, (void *)&JVM_GetNestMembers},
- {"linkClass", "(" CLS ")V", (void *)&JVM_LinkClass},
};
#undef OBJ
diff -r 1d1f9c43138f -r d67ebc838ab8 test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java
--- a/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java Mon Nov 04 11:05:10 2019 -0800
+++ b/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java Mon Nov 04 11:42:24 2019 -0800
@@ -130,7 +130,7 @@
public static void loadClass(WhiteBox wb) {
try {
URLClassLoader ucl = new URLClassLoader(urls);
- ucl.loadClass("case00");
+ Class.forName("case00", false, ucl);
} catch (Exception e) {
e.printStackTrace();
}
diff -r 1d1f9c43138f -r d67ebc838ab8 test/hotspot/jtreg/serviceability/jvmti/ClassStatus/ClassStatus.java
--- a/test/hotspot/jtreg/serviceability/jvmti/ClassStatus/ClassStatus.java Mon Nov 04 11:05:10 2019 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-/**
- * @test
- * @bug 8212117
- * @summary Verify JVMTI GetClassStatus returns CLASS_PREPARE after call to Class.forName()
- * @run main/othervm/native -agentlib:ClassStatus ClassStatus
- */
-
-
-public class ClassStatus {
- static {
- try {
- System.out.println("ClassStatus static block");
- System.loadLibrary("ClassStatus");
- } catch (UnsatisfiedLinkError ule) {
- System.err.println("Could not load ClassStatus library");
- System.err.println("java.library.path: "
- + System.getProperty("java.library.path"));
- throw ule;
- }
- }
-
- static native int check(Class klass);
-
- public static void main(String[] args) throws ClassNotFoundException {
- ClassLoader loader = ClassStatus.class.getClassLoader();
- Module module = loader.getUnnamedModule();
-
- // Load class, but don't initialize it
- Class foo2 = Class.forName(module, "Foo2");
- Class foo3 = Class.forName("Foo3", false, loader);
-
- System.out.println("Loaded: " + foo2);
- System.out.println("Loaded: " + foo3);
-
- int status2 = check(foo2);
- int status3 = check(foo3);
-
- new Foo2().bar();
- new Foo3().bar();
-
- if (status2 != 0) {
- System.out.println("The agent returned non-zero exit status for Foo2: " + status2);
- }
- if (status3 != 0) {
- System.out.println("The agent returned non-zero exit status for Foo3: " + status3);
- }
- if (status2 != 0 || status3 != 0) {
- throw new RuntimeException("Non-zero status returned from the agent");
- }
- }
-}
-
-class Foo2 {
- static {
- System.out.println("Foo2 is initialized");
- }
- void bar() {
- System.out.println("Foo2.bar() is called");
- }
-}
-
-class Foo3 {
- static {
- System.out.println("Foo3 is initialized");
- }
- void bar() {
- System.out.println("Foo3.bar() is called");
- }
-}
diff -r 1d1f9c43138f -r d67ebc838ab8 test/hotspot/jtreg/serviceability/jvmti/ClassStatus/libClassStatus.c
--- a/test/hotspot/jtreg/serviceability/jvmti/ClassStatus/libClassStatus.c Mon Nov 04 11:05:10 2019 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-#include