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

8193414: Improvements in MethodType lookups

Browse source 
Reviewed-by: ahgross, jrose
This commit is contained in:
Paul Sandoz 2017-12-12 16:37:39 -08:00
parent 4ea3d766b6
commit d051769f79
1 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/java.base/share/classes/java/lang/invoke/MethodType.java
View file

@ -1206,33 +1206,24 @@ s.writeObject(this.parameterArray());
* @param s the stream to read the object from * @param s the stream to read the object from
* @throws java.io.IOException if there is a problem reading the object * @throws java.io.IOException if there is a problem reading the object
* @throws ClassNotFoundException if one of the component classes cannot be resolved * @throws ClassNotFoundException if one of the component classes cannot be resolved
* @see #MethodType()
* @see #readResolve * @see #readResolve
* @see #writeObject * @see #writeObject
*/ */
private void readObject(java.io.ObjectInputStream s) throws java.io.IOException, ClassNotFoundException { private void readObject(java.io.ObjectInputStream s) throws java.io.IOException, ClassNotFoundException {
// Assign temporary defaults in case this object escapes
MethodType_init(void.class, NO_PTYPES);
s.defaultReadObject(); // requires serialPersistentFields to be an empty array s.defaultReadObject(); // requires serialPersistentFields to be an empty array
Class<?> returnType = (Class<?>) s.readObject(); Class<?> returnType = (Class<?>) s.readObject();
Class<?>[] parameterArray = (Class<?>[]) s.readObject(); Class<?>[] parameterArray = (Class<?>[]) s.readObject();
// Probably this object will never escape, but let's check
// the field values now, just to be sure.
checkRtype(returnType);
checkPtypes(parameterArray);
parameterArray = parameterArray.clone(); // make sure it is unshared parameterArray = parameterArray.clone(); // make sure it is unshared
// Assign deserialized values
MethodType_init(returnType, parameterArray); MethodType_init(returnType, parameterArray);
} }
/** // Initialization of state for deserialization only
* For serialization only.
* Sets the final fields to null, pending {@code Unsafe.putObject}.
*/
private MethodType() {
this.rtype = null;
this.ptypes = null;
}
private void MethodType_init(Class<?> rtype, Class<?>[] ptypes) { private void MethodType_init(Class<?> rtype, Class<?>[] ptypes) {
// In order to communicate these values to readResolve, we must // In order to communicate these values to readResolve, we must
// store them into the implementation-specific final fields. // store them into the implementation-specific final fields.
@ -1259,9 +1250,14 @@ s.writeObject(this.parameterArray());
*/ */
private Object readResolve() { private Object readResolve() {
// Do not use a trusted path for deserialization: // Do not use a trusted path for deserialization:
//return makeImpl(rtype, ptypes, true); // return makeImpl(rtype, ptypes, true);
// Verify all operands, and make sure ptypes is unshared: // Verify all operands, and make sure ptypes is unshared:
try {
return methodType(rtype, ptypes); return methodType(rtype, ptypes);
} finally {
// Re-assign defaults in case this object escapes
MethodType_init(void.class, NO_PTYPES);
}
} }
/** /**