archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8233091: Backout JDK-8212117: Class.forName loads a class but not linked if class is not initialized

Browse source 
Reviewed-by: alanb, dholmes, mchung
This commit is contained in:
Brent Christian 2019-11-04 11:42:24 -08:00
parent 691e75e223
commit 3561b4ed50
13 changed files with 14 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/java.base/share/classes/java/lang/Class.java
View file

@ -392,10 +392,6 @@ public final class Class<T> implements java.io.Serializable,
*
* @see java.lang.Class#forName(String)
* @see java.lang.ClassLoader
*
* @jls 12.2 Loading of Classes and Interfaces
* @jls 12.3 Linking of Classes and Interfaces
* @jls 12.4 Initialization of Classes and Interfaces
* @since 1.2
*/
@CallerSensitive
@ -442,10 +438,6 @@ public final class Class<T> implements java.io.Serializable,
* <p> This method does not check whether the requested class is
* accessible to its caller. </p>
*
* <p> Note that this method throws errors related to loading and linking as
* specified in Sections 12.2 and 12.3 of <em>The Java Language
* Specification</em>.
*
* @apiNote
* This method returns {@code null} on failure rather than
* throwing a {@link ClassNotFoundException}, as is done by
@ -473,8 +465,6 @@ public final class Class<T> implements java.io.Serializable,
* in a module.</li>
* </ul>
*
* @jls 12.2 Loading of Classes and Interfaces
* @jls 12.3 Linking of Classes and Interfaces
* @since 9
* @spec JPMS
*/
@ -498,21 +488,13 @@ public final class Class<T> implements java.io.Serializable,
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}

14
src/java.base/share/classes/java/lang/invoke/MethodHandles.java
View file

@ -1933,17 +1933,12 @@ assertEquals("[x, y, z]", pb.command().toString());
}
/**
* 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.
* <p>
* The lookup context here is determined by the {@linkplain #lookupClass() lookup class}, its class
* loader, and the {@linkplain #lookupModes() lookup modes}.
* <p>
* Note that this method throws errors related to loading and linking as
* specified in Sections 12.2 and 12.3 of <em>The Java Language
* Specification</em>.
* 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 @@ assertEquals("[x, y, z]", pb.command().toString());
* modes.
* @throws SecurityException if a security manager is present and it
* <a href="MethodHandles.Lookup.html#secmgr">refuses access</a>
*
* @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 {