Make Ref classes for shared vars Serializable

udalov · udalov · commit 8e3cb912c7d4 · 2017-02-15T10:46:48.000+03:00
#KT-14566 Fixed
diff --git a/compiler/testData/codegen/box/closures/refsAreSerializable.kt b/compiler/testData/codegen/box/closures/refsAreSerializable.kt
@@ -0,0 +1,34 @@
+// IGNORE_BACKEND: JS
+
+import java.io.*
+
+fun box(): String {
+    var o = ""
+    var b = 0.toByte()
+    var d = 0.0
+    var f = 0.0f
+    var i = 0
+    var j = 0L
+    var s = 0.toShort()
+    var c = '0'
+    var z = false
+
+    val lambda = fun(): String {
+        o = "OK"
+        b++; d++; f++; i++; j++; s++; c++
+        z = true
+        return o
+    }
+
+    val baos = ByteArrayOutputStream()
+    val oos = ObjectOutputStream(baos)
+    oos.writeObject(lambda)
+    oos.close()
+
+    val bais = ByteArrayInputStream(baos.toByteArray())
+    val ois = ObjectInputStream(bais)
+    val result = ois.readObject() as () -> String
+    ois.close()
+
+    return result()
+}
diff --git a/compiler/testData/codegen/light-analysis/closures/refsAreSerializable.txt b/compiler/testData/codegen/light-analysis/closures/refsAreSerializable.txt
@@ -0,0 +1,4 @@
+@kotlin.Metadata
+public final class RefsAreSerializableKt {
+    public final static @org.jetbrains.annotations.NotNull method box(): java.lang.String
+}
diff --git a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
@@ -3617,6 +3617,12 @@ public void testRecursiveClosure() throws Exception {
             doTest(fileName);
         }
 
+        @TestMetadata("refsAreSerializable.kt")
+        public void testRefsAreSerializable() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/refsAreSerializable.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("simplestClosure.kt")
         public void testSimplestClosure() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/simplestClosure.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
@@ -3617,6 +3617,12 @@ public void testRecursiveClosure() throws Exception {
             doTest(fileName);
         }
 
+        @TestMetadata("refsAreSerializable.kt")
+        public void testRefsAreSerializable() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/refsAreSerializable.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("simplestClosure.kt")
         public void testSimplestClosure() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/simplestClosure.kt");
diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/Ref.java b/core/runtime.jvm/src/kotlin/jvm/internal/Ref.java
@@ -16,10 +16,12 @@
 
 package kotlin.jvm.internal;
 
+import java.io.Serializable;
+
 public class Ref {
     private Ref() {}
 
-    public static final class ObjectRef<T> {
+    public static final class ObjectRef<T> implements Serializable {
         public T element;
 
         @Override
@@ -28,7 +30,7 @@ public String toString() {
         }
     }
 
-    public static final class ByteRef {
+    public static final class ByteRef implements Serializable {
         public byte element;
 
         @Override
@@ -37,7 +39,7 @@ public String toString() {
         }
     }
 
-    public static final class ShortRef {
+    public static final class ShortRef implements Serializable {
         public short element;
 
         @Override
@@ -46,7 +48,7 @@ public String toString() {
         }
     }
 
-    public static final class IntRef {
+    public static final class IntRef implements Serializable {
         public int element;
 
         @Override
@@ -55,7 +57,7 @@ public String toString() {
         }
     }
 
-    public static final class LongRef {
+    public static final class LongRef implements Serializable {
         public long element;
 
         @Override
@@ -64,7 +66,7 @@ public String toString() {
         }
     }
 
-    public static final class FloatRef {
+    public static final class FloatRef implements Serializable {
         public float element;
 
         @Override
@@ -73,7 +75,7 @@ public String toString() {
         }
     }
 
-    public static final class DoubleRef {
+    public static final class DoubleRef implements Serializable {
         public double element;
 
         @Override
@@ -82,7 +84,7 @@ public String toString() {
         }
     }
 
-    public static final class CharRef {
+    public static final class CharRef implements Serializable {
         public char element;
 
         @Override
@@ -91,7 +93,7 @@ public String toString() {
         }
     }
 
-    public static final class BooleanRef {
+    public static final class BooleanRef implements Serializable {
         public boolean element;
 
         @Override
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
@@ -4284,6 +4284,18 @@ public void testRecursiveClosure() throws Exception {
             doTest(fileName);
         }
 
+        @TestMetadata("refsAreSerializable.kt")
+        public void testRefsAreSerializable() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/refsAreSerializable.kt");
+            try {
+                doTest(fileName);
+            }
+            catch (Throwable ignore) {
+                return;
+            }
+            throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that.");
+        }
+
         @TestMetadata("simplestClosure.kt")
         public void testSimplestClosure() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/simplestClosure.kt");
diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt
@@ -759,55 +759,55 @@ public class kotlin/jvm/internal/PropertyReference2Impl : kotlin/jvm/internal/Pr
 public class kotlin/jvm/internal/Ref {
 }
 
-public final class kotlin/jvm/internal/Ref$BooleanRef {
+public final class kotlin/jvm/internal/Ref$BooleanRef : java/io/Serializable {
 	public field element Z
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$ByteRef {
+public final class kotlin/jvm/internal/Ref$ByteRef : java/io/Serializable {
 	public field element B
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$CharRef {
+public final class kotlin/jvm/internal/Ref$CharRef : java/io/Serializable {
 	public field element C
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$DoubleRef {
+public final class kotlin/jvm/internal/Ref$DoubleRef : java/io/Serializable {
 	public field element D
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$FloatRef {
+public final class kotlin/jvm/internal/Ref$FloatRef : java/io/Serializable {
 	public field element F
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$IntRef {
+public final class kotlin/jvm/internal/Ref$IntRef : java/io/Serializable {
 	public field element I
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$LongRef {
+public final class kotlin/jvm/internal/Ref$LongRef : java/io/Serializable {
 	public field element J
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$ObjectRef {
+public final class kotlin/jvm/internal/Ref$ObjectRef : java/io/Serializable {
 	public field element Ljava/lang/Object;
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$ShortRef {
+public final class kotlin/jvm/internal/Ref$ShortRef : java/io/Serializable {
 	public field element S
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
@@ -2754,55 +2754,55 @@ public class kotlin/jvm/internal/PropertyReference2Impl : kotlin/jvm/internal/Pr
 public class kotlin/jvm/internal/Ref {
 }
 
-public final class kotlin/jvm/internal/Ref$BooleanRef {
+public final class kotlin/jvm/internal/Ref$BooleanRef : java/io/Serializable {
 	public field element Z
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$ByteRef {
+public final class kotlin/jvm/internal/Ref$ByteRef : java/io/Serializable {
 	public field element B
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$CharRef {
+public final class kotlin/jvm/internal/Ref$CharRef : java/io/Serializable {
 	public field element C
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$DoubleRef {
+public final class kotlin/jvm/internal/Ref$DoubleRef : java/io/Serializable {
 	public field element D
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$FloatRef {
+public final class kotlin/jvm/internal/Ref$FloatRef : java/io/Serializable {
 	public field element F
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$IntRef {
+public final class kotlin/jvm/internal/Ref$IntRef : java/io/Serializable {
 	public field element I
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$LongRef {
+public final class kotlin/jvm/internal/Ref$LongRef : java/io/Serializable {
 	public field element J
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$ObjectRef {
+public final class kotlin/jvm/internal/Ref$ObjectRef : java/io/Serializable {
 	public field element Ljava/lang/Object;
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class kotlin/jvm/internal/Ref$ShortRef {
+public final class kotlin/jvm/internal/Ref$ShortRef : java/io/Serializable {
 	public field element S
 	public fun <init> ()V
 	public fun toString ()Ljava/lang/String;

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,12 @@`
`16`	`16`
`17`	`17`	`package kotlin.jvm.internal;`
`18`	`18`
	`19`	`+import java.io.Serializable;`
	`20`	`+`
`19`	`21`	`public class Ref {`
`20`	`22`	`private Ref() {}`
`21`	`23`
`22`		`- public static final class ObjectRef<T> {`
	`24`	`+ public static final class ObjectRef<T> implements Serializable {`
`23`	`25`	`public T element;`
`24`	`26`
`25`	`27`	`@Override`
`@@ -28,7 +30,7 @@ public String toString() {`
`28`	`30`	`}`
`29`	`31`	`}`
`30`	`32`
`31`		`- public static final class ByteRef {`
	`33`	`+ public static final class ByteRef implements Serializable {`
`32`	`34`	`public byte element;`
`33`	`35`
`34`	`36`	`@Override`
`@@ -37,7 +39,7 @@ public String toString() {`
`37`	`39`	`}`
`38`	`40`	`}`
`39`	`41`
`40`		`- public static final class ShortRef {`
	`42`	`+ public static final class ShortRef implements Serializable {`
`41`	`43`	`public short element;`
`42`	`44`
`43`	`45`	`@Override`
`@@ -46,7 +48,7 @@ public String toString() {`
`46`	`48`	`}`
`47`	`49`	`}`
`48`	`50`
`49`		`- public static final class IntRef {`
	`51`	`+ public static final class IntRef implements Serializable {`
`50`	`52`	`public int element;`
`51`	`53`
`52`	`54`	`@Override`
`@@ -55,7 +57,7 @@ public String toString() {`
`55`	`57`	`}`
`56`	`58`	`}`
`57`	`59`
`58`		`- public static final class LongRef {`
	`60`	`+ public static final class LongRef implements Serializable {`
`59`	`61`	`public long element;`
`60`	`62`
`61`	`63`	`@Override`
`@@ -64,7 +66,7 @@ public String toString() {`
`64`	`66`	`}`
`65`	`67`	`}`
`66`	`68`
`67`		`- public static final class FloatRef {`
	`69`	`+ public static final class FloatRef implements Serializable {`
`68`	`70`	`public float element;`
`69`	`71`
`70`	`72`	`@Override`
`@@ -73,7 +75,7 @@ public String toString() {`
`73`	`75`	`}`
`74`	`76`	`}`
`75`	`77`
`76`		`- public static final class DoubleRef {`
	`78`	`+ public static final class DoubleRef implements Serializable {`
`77`	`79`	`public double element;`
`78`	`80`
`79`	`81`	`@Override`
`@@ -82,7 +84,7 @@ public String toString() {`
`82`	`84`	`}`
`83`	`85`	`}`
`84`	`86`
`85`		`- public static final class CharRef {`
	`87`	`+ public static final class CharRef implements Serializable {`
`86`	`88`	`public char element;`
`87`	`89`
`88`	`90`	`@Override`
`@@ -91,7 +93,7 @@ public String toString() {`
`91`	`93`	`}`
`92`	`94`	`}`
`93`	`95`
`94`		`- public static final class BooleanRef {`
	`96`	`+ public static final class BooleanRef implements Serializable {`
`95`	`97`	`public boolean element;`
`96`	`98`
`97`	`99`	`@Override`