[nomaster] bring back SerializeStart from fa3b8040eb

This is necessary to maintain binary compatibility with 2.10.0.

2 files changed, 14 insertions, 10 deletions

diff --git a/bincompat-backward.whitelist.conf b/bincompat-backward.whitelist.conf
index 07f459c922..7baecc63a0 100644
--- a/bincompat-backward.whitelist.conf
+++ b/bincompat-backward.whitelist.conf
@@ -11,16 +11,16 @@ filter {
             matchName="scala.collection.immutable.Stream.scala$collection$immutable$Stream$$loop$5"
             problemName=MissingMethodProblem
         },
-        {
-            # private[scala]
-            matchName="scala.collection.immutable.ListSerializeStart$"
-            problemName=MissingClassProblem
-        },
-        {
-            # private[scala]
-            matchName="scala.collection.immutable.ListSerializeStart"
-            problemName=MissingClassProblem
-        },
+        # {
+        #     # private[scala]
+        #     matchName="scala.collection.immutable.ListSerializeStart$"
+        #     problemName=MissingClassProblem
+        # },
+        # {
+        #     # private[scala]
+        #     matchName="scala.collection.immutable.ListSerializeStart"
+        #     problemName=MissingClassProblem
+        # },
         {
             # private nested class became private top-level class to fix SI-7018
             matchName="scala.reflect.macros.Attachments$NonemptyAttachments"
diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala
index 9765e7c52f..2d6952ff92 100644
--- a/src/library/scala/collection/immutable/List.scala
+++ b/src/library/scala/collection/immutable/List.scala
@@ -643,6 +643,10 @@ object List extends SeqFactory[List] {
 }
 
 /** Only used for list serialization */
+@SerialVersionUID(0L - 8287891243975527522L)
+private[scala] case object ListSerializeStart
+
+/** Only used for list serialization */
 @SerialVersionUID(0L - 8476791151975527571L)
 private[scala] case object ListSerializeEnd