mirror of
https://github.com/openjdk/jdk.git
synced 2026-01-28 03:58:21 +00:00
Updates for --debug=dumpLambdaDeserializationStats
This commit is contained in:
Liam Miller-Cushon
parent
27eda3d505
commit
af40ea14c4
@ -759,7 +759,8 @@ public class LambdaToMethod extends TreeTranslator {
|
||||
implMethodKind,
|
||||
implClass,
|
||||
implMethodName,
|
||||
implMethodSignature));
|
||||
implMethodSignature,
|
||||
instantiatedMethodType));
|
||||
}
|
||||
stmts.append(stmt);
|
||||
}
|
||||
|
||||
@ -1701,7 +1701,7 @@ compiler.note.mref.stat.1=\
|
||||
alternate metafactory = {0}\n\
|
||||
bridge method = {1}
|
||||
|
||||
# 0: string, 1: string, 2: string, 3: number, 4: string, 5: string, 6: string
|
||||
# 0: string, 1: string, 2: string, 3: number, 4: string, 5: string, 6: string, 7: string
|
||||
compiler.note.lambda.deserialization.stat=\
|
||||
Generating lambda deserialization\n\
|
||||
functionalInterfaceClass: {0}\n\
|
||||
@ -1710,7 +1710,8 @@ compiler.note.lambda.deserialization.stat=\
|
||||
implMethodKind: {3}\n\
|
||||
implClass: {4}\n\
|
||||
implMethodName: {5}\n\
|
||||
implMethodSignature: {6}
|
||||
implMethodSignature: {6}\n\
|
||||
instantiatedMethodType: {7}
|
||||
|
||||
compiler.note.note=\
|
||||
Note:\u0020
|
||||
|
||||
@ -22,10 +22,12 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
@test
|
||||
@bug 8208752
|
||||
@summary NPE generating serializedLambdaName for nested lambda
|
||||
*/
|
||||
* @test
|
||||
* @bug 8208752
|
||||
* @summary NPE generating serializedLambdaName for nested lambda
|
||||
* @compile/ref=LambdaSerializedClassCastException.out -XDrawDiagnostics --debug=dumpLambdaDeserializationStats LambdaSerializedClassCastException.java
|
||||
* @run main LambdaSerializedClassCastException
|
||||
*/
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
@ -50,13 +52,12 @@ public class LambdaSerializedClassCastException {
|
||||
@SuppressWarnings("unchecked")
|
||||
static <T> T serialDeserial(T object) throws Exception {
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
ObjectOutputStream oos = new ObjectOutputStream(baos);
|
||||
oos.writeObject(object);
|
||||
oos.close();
|
||||
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
|
||||
ObjectInputStream ois = new ObjectInputStream(bais);
|
||||
T result = (T) ois.readObject();
|
||||
ois.close();
|
||||
return result;
|
||||
try (ObjectOutputStream oos = new ObjectOutputStream(baos)) {
|
||||
oos.writeObject(object);
|
||||
}
|
||||
try (ObjectInputStream ois =
|
||||
new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()))) {
|
||||
return (T) ois.readObject();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,2 @@
|
||||
LambdaSerializedClassCastException.java:44:59: compiler.note.lambda.deserialization.stat: java/util/function/Function, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, toString, ()Ljava/lang/String;, (Ljava/lang/String;)Ljava/lang/String;
|
||||
LambdaSerializedClassCastException.java:46:59: compiler.note.lambda.deserialization.stat: java/util/function/Function, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, toString, ()Ljava/lang/String;, (Ljava/lang/Object;)Ljava/lang/String;
|
||||
@ -24,19 +24,22 @@
|
||||
/*
|
||||
* @test
|
||||
* @summary test lambda deserialization for Object method references on interfaces
|
||||
* @library /tools/lib
|
||||
* @modules jdk.compiler/com.sun.tools.javac.api
|
||||
* jdk.compiler/com.sun.tools.javac.main
|
||||
* jdk.jdeps/com.sun.tools.javap
|
||||
* @build toolbox.ToolBox toolbox.JavacTask
|
||||
* @compile/ref=SerializableObjectMethodReferencesOnInterfaces.out -XDrawDiagnostics --debug=dumpLambdaDeserializationStats SerializableObjectMethodReferencesOnInterfaces.java
|
||||
* @run main SerializableObjectMethodReferencesOnInterfaces
|
||||
*/
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.ObjectInputStream;
|
||||
import java.io.ObjectOutputStream;
|
||||
import java.io.Serializable;
|
||||
import java.lang.classfile.*;
|
||||
|
||||
public class SerializableObjectMethodReferencesOnInterfaces {
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
new Test().run();
|
||||
}
|
||||
|
||||
static class Test {
|
||||
interface I1 extends Serializable {}
|
||||
|
||||
@ -53,11 +56,28 @@ public class SerializableObjectMethodReferencesOnInterfaces {
|
||||
ONE
|
||||
}
|
||||
|
||||
void f() throws Exception {
|
||||
void run() throws Exception {
|
||||
F<I1, Integer> f1 = I1::hashCode;
|
||||
F<I2, Integer> f2 = I2::hashCode;
|
||||
F<E, Integer> f3 = E::hashCode;
|
||||
F<Object, Integer> f4 = Object::hashCode;
|
||||
|
||||
serialDeserial(f1).apply(new I1() {});
|
||||
serialDeserial(f2).apply(new I2() {});
|
||||
serialDeserial(f3).apply(E.ONE);
|
||||
serialDeserial(f4).apply(new Object());
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
static <T> T serialDeserial(T object) throws Exception {
|
||||
ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||
try (ObjectOutputStream oos = new ObjectOutputStream(baos)) {
|
||||
oos.writeObject(object);
|
||||
}
|
||||
try (ObjectInputStream ois =
|
||||
new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()))) {
|
||||
return (T) ois.readObject();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
SerializableObjectMethodReferencesOnInterfaces.java:57:33: compiler.note.lambda.deserialization.stat: SerializableObjectMethodReferencesOnInterfaces$Test$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I
|
||||
SerializableObjectMethodReferencesOnInterfaces.java:58:33: compiler.note.lambda.deserialization.stat: SerializableObjectMethodReferencesOnInterfaces$Test$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I
|
||||
SerializableObjectMethodReferencesOnInterfaces.java:59:32: compiler.note.lambda.deserialization.stat: SerializableObjectMethodReferencesOnInterfaces$Test$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Enum, hashCode, ()I
|
||||
SerializableObjectMethodReferencesOnInterfaces.java:60:37: compiler.note.lambda.deserialization.stat: SerializableObjectMethodReferencesOnInterfaces$Test$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I
|
||||
SerializableObjectMethodReferencesOnInterfaces.java:60:33: compiler.note.lambda.deserialization.stat: SerializableObjectMethodReferencesOnInterfaces$Test$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I, (LSerializableObjectMethodReferencesOnInterfaces$Test$I1;)Ljava/lang/Integer;
|
||||
SerializableObjectMethodReferencesOnInterfaces.java:61:33: compiler.note.lambda.deserialization.stat: SerializableObjectMethodReferencesOnInterfaces$Test$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I, (LSerializableObjectMethodReferencesOnInterfaces$Test$I2;)Ljava/lang/Integer;
|
||||
SerializableObjectMethodReferencesOnInterfaces.java:62:32: compiler.note.lambda.deserialization.stat: SerializableObjectMethodReferencesOnInterfaces$Test$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Enum, hashCode, ()I, (LSerializableObjectMethodReferencesOnInterfaces$Test$E;)Ljava/lang/Integer;
|
||||
SerializableObjectMethodReferencesOnInterfaces.java:63:37: compiler.note.lambda.deserialization.stat: SerializableObjectMethodReferencesOnInterfaces$Test$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I, (Ljava/lang/Object;)Ljava/lang/Integer;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
SerializableObjectMethods.java:59:35: compiler.note.lambda.deserialization.stat: SerializableObjectMethods$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I
|
||||
SerializableObjectMethods.java:60:35: compiler.note.lambda.deserialization.stat: SerializableObjectMethods$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I
|
||||
SerializableObjectMethods.java:59:35: compiler.note.lambda.deserialization.stat: SerializableObjectMethods$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I, (LSerializableObjectMethods$I1;)Ljava/lang/Integer;
|
||||
SerializableObjectMethods.java:60:35: compiler.note.lambda.deserialization.stat: SerializableObjectMethods$F, apply, (Ljava/lang/Object;)Ljava/lang/Object;, 5, java/lang/Object, hashCode, ()I, (LSerializableObjectMethods$I2;)Ljava/lang/Integer;
|
||||
- compiler.note.unchecked.filename: SerializableObjectMethods.java
|
||||
- compiler.note.unchecked.recompile
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user