keep serialization stability on Scala 3.2

fixes scala#222
SethTisue · Jul 11, 2022 · e362ac4 · e362ac4
1 parent 0d83ab1
commit e362ac4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/src/main/scala/scala/collection/immutable/OldHashSet.scala b/core/src/main/scala/scala/collection/immutable/OldHashSet.scala
@@ -506,6 +506,7 @@ object OldHashSet extends IterableFactory[OldHashSet] {
     * elems: [a,b]
     * children:        ---b----------------a-----------
     */
+  @SerialVersionUID(-2139837478000879198L)
   private[collection] final class HashTrieSet[A](private val bitmap: Int, private[collection] val elems: Array[OldHashSet[A]], private val size0: Int)
     extends OldHashSet[A] {
     assert(Integer.bitCount(bitmap) == elems.length)

diff --git a/junit/src/test/scala-2/scala/SerializationStabilityTest.scala b/junit/src/test/scala-2/scala/SerializationStabilityTest.scala
@@ -38,15 +38,15 @@ object SerializationStability extends App with SerializationStabilityBase {
     }
   }
 
-  // Generated on 20201015-13:14:45 with Scala version 2.13.3)
+  // Generated on 20220711-14:22:40 with Scala version 2.13.8)
   overwrite.foreach(updateComment)
 
   // check(new collection.concurrent.TrieMap[Any, Any]())( "rO0ABXNyACNzY2FsYS5jb2xsZWN0aW9uLmNvbmN1cnJlbnQuVHJpZU1hcKckxpgOIYHPAwAETAALZXF1YWxpdHlvYmp0ABJMc2NhbGEvbWF0aC9FcXVpdjtMAApoYXNoaW5nb2JqdAAcTHNjYWxhL3V0aWwvaGFzaGluZy9IYXNoaW5nO0wABHJvb3R0ABJMamF2YS9sYW5nL09iamVjdDtMAAtyb290dXBkYXRlcnQAOUxqYXZhL3V0aWwvY29uY3VycmVudC9hdG9taWMvQXRvbWljUmVmZXJlbmNlRmllbGRVcGRhdGVyO3hwc3IAMnNjYWxhLmNvbGxlY3Rpb24uY29uY3VycmVudC5UcmllTWFwJE1hbmdsZWRIYXNoaW5nhTBoJQ/mgb0CAAB4cHNyABhzY2FsYS5tYXRoLkVxdWl2JCRhbm9uJDLBbyx4dy/qGwIAAHhwc3IANHNjYWxhLmNvbGxlY3Rpb24uY29uY3VycmVudC5UcmllTWFwU2VyaWFsaXphdGlvbkVuZCSbjdgbbGCt2gIAAHhweA==")
   // not sure why this one needs stable serialization.
 
   import collection.parallel
   check(parallel.immutable.ParHashMap(1 -> 2))( "rO0ABXNyAC5zY2FsYS5jb2xsZWN0aW9uLnBhcmFsbGVsLmltbXV0YWJsZS5QYXJIYXNoTWFwAAAAAAAAAAMCAANMAA9TY2FuTGVhZiRtb2R1bGV0ADVMc2NhbGEvY29sbGVjdGlvbi9wYXJhbGxlbC9QYXJJdGVyYWJsZUxpa2UkU2NhbkxlYWYkO0wAD1NjYW5Ob2RlJG1vZHVsZXQANUxzY2FsYS9jb2xsZWN0aW9uL3BhcmFsbGVsL1Bhckl0ZXJhYmxlTGlrZSRTY2FuTm9kZSQ7TAAEdHJpZXQAJ0xzY2FsYS9jb2xsZWN0aW9uL2ltbXV0YWJsZS9PbGRIYXNoTWFwO3hwcHBzcgAxc2NhbGEuY29sbGVjdGlvbi5pbW11dGFibGUuT2xkSGFzaE1hcCRPbGRIYXNoTWFwMS7zjpoZzkeMAgAESQAEaGFzaEwAA2tleXQAEkxqYXZhL2xhbmcvT2JqZWN0O0wAAmt2dAAOTHNjYWxhL1R1cGxlMjtMAAV2YWx1ZXEAfgAGeHIAJXNjYWxhLmNvbGxlY3Rpb24uaW1tdXRhYmxlLk9sZEhhc2hNYXDeVobyra7aQwIAAHhw/4PO53NyABFqYXZhLmxhbmcuSW50ZWdlchLioKT3gYc4AgABSQAFdmFsdWV4cgAQamF2YS5sYW5nLk51bWJlcoaslR0LlOCLAgAAeHAAAAABc3IADHNjYWxhLlR1cGxlMgH73c0i5zR6AgACTAACXzFxAH4ABkwAAl8ycQB+AAZ4cHEAfgAMc3EAfgAKAAAAAnEAfgAP")
-  check(parallel.immutable.ParHashSet(1, 2, 3))( "rO0ABXNyAC5zY2FsYS5jb2xsZWN0aW9uLnBhcmFsbGVsLmltbXV0YWJsZS5QYXJIYXNoU2V0AAAAAAAAAAECAANMAA9TY2FuTGVhZiRtb2R1bGV0ADVMc2NhbGEvY29sbGVjdGlvbi9wYXJhbGxlbC9QYXJJdGVyYWJsZUxpa2UkU2NhbkxlYWYkO0wAD1NjYW5Ob2RlJG1vZHVsZXQANUxzY2FsYS9jb2xsZWN0aW9uL3BhcmFsbGVsL1Bhckl0ZXJhYmxlTGlrZSRTY2FuTm9kZSQ7TAAEdHJpZXQAJ0xzY2FsYS9jb2xsZWN0aW9uL2ltbXV0YWJsZS9PbGRIYXNoU2V0O3hwcHBzcgAxc2NhbGEuY29sbGVjdGlvbi5pbW11dGFibGUuT2xkSGFzaFNldCRIYXNoVHJpZVNldEQhDb9ZpSE5AgADSQAGYml0bWFwSQAFc2l6ZTBbAAVlbGVtc3QAKFtMc2NhbGEvY29sbGVjdGlvbi9pbW11dGFibGUvT2xkSGFzaFNldDt4cgAlc2NhbGEuY29sbGVjdGlvbi5pbW11dGFibGUuT2xkSGFzaFNldBh++KjntXtjAgAAeHAAEECAAAAAA3VyAChbTHNjYWxhLmNvbGxlY3Rpb24uaW1tdXRhYmxlLk9sZEhhc2hTZXQ7CAD6Mv3ASA4CAAB4cAAAAANzcgAxc2NhbGEuY29sbGVjdGlvbi5pbW11dGFibGUuT2xkSGFzaFNldCRPbGRIYXNoU2V0MR1AgCzq7c4OAgACSQAEaGFzaEwAA2tleXQAEkxqYXZhL2xhbmcvT2JqZWN0O3hyADRzY2FsYS5jb2xsZWN0aW9uLmltbXV0YWJsZS5PbGRIYXNoU2V0JExlYWZPbGRIYXNoU2V0XYS37WNapt0CAAB4cQB+AAf/g87nc3IAEWphdmEubGFuZy5JbnRlZ2VyEuKgpPeBhzgCAAFJAAV2YWx1ZXhyABBqYXZhLmxhbmcuTnVtYmVyhqyVHQuU4IsCAAB4cAAAAAFzcQB+AAv/g6zOc3EAfgAPAAAAAnNxAH4AC/+DitRzcQB+AA8AAAAD")
+  check(parallel.immutable.ParHashSet(1, 2, 3))( "rO0ABXNyAC5zY2FsYS5jb2xsZWN0aW9uLnBhcmFsbGVsLmltbXV0YWJsZS5QYXJIYXNoU2V0AAAAAAAAAAECAANMAA9TY2FuTGVhZiRtb2R1bGV0ADVMc2NhbGEvY29sbGVjdGlvbi9wYXJhbGxlbC9QYXJJdGVyYWJsZUxpa2UkU2NhbkxlYWYkO0wAD1NjYW5Ob2RlJG1vZHVsZXQANUxzY2FsYS9jb2xsZWN0aW9uL3BhcmFsbGVsL1Bhckl0ZXJhYmxlTGlrZSRTY2FuTm9kZSQ7TAAEdHJpZXQAJ0xzY2FsYS9jb2xsZWN0aW9uL2ltbXV0YWJsZS9PbGRIYXNoU2V0O3hwcHBzcgAxc2NhbGEuY29sbGVjdGlvbi5pbW11dGFibGUuT2xkSGFzaFNldCRIYXNoVHJpZVNldOJNxSausJmiAgADSQAGYml0bWFwSQAFc2l6ZTBbAAVlbGVtc3QAKFtMc2NhbGEvY29sbGVjdGlvbi9pbW11dGFibGUvT2xkSGFzaFNldDt4cgAlc2NhbGEuY29sbGVjdGlvbi5pbW11dGFibGUuT2xkSGFzaFNldBh++KjntXtjAgAAeHAAEECAAAAAA3VyAChbTHNjYWxhLmNvbGxlY3Rpb24uaW1tdXRhYmxlLk9sZEhhc2hTZXQ7CAD6Mv3ASA4CAAB4cAAAAANzcgAxc2NhbGEuY29sbGVjdGlvbi5pbW11dGFibGUuT2xkSGFzaFNldCRPbGRIYXNoU2V0MR1AgCzq7c4OAgACSQAEaGFzaEwAA2tleXQAEkxqYXZhL2xhbmcvT2JqZWN0O3hyADRzY2FsYS5jb2xsZWN0aW9uLmltbXV0YWJsZS5PbGRIYXNoU2V0JExlYWZPbGRIYXNoU2V0XYS37WNapt0CAAB4cQB+AAf/g87nc3IAEWphdmEubGFuZy5JbnRlZ2VyEuKgpPeBhzgCAAFJAAV2YWx1ZXhyABBqYXZhLmxhbmcuTnVtYmVyhqyVHQuU4IsCAAB4cAAAAAFzcQB+AAv/g6zOc3EAfgAPAAAAAnNxAH4AC/+DitRzcQB+AA8AAAAD")
   // TODO SI-8576 Uninitialized field under -Xcheckinit
   // check(new parallel.immutable.ParRange(new Range(0, 1, 2)))( "rO0ABXNyACxzY2FsYS5jb2xsZWN0aW9uLnBhcmFsbGVsLmltbXV0YWJsZS5QYXJSYW5nZQAAAAAAAAABAgAETAAXUGFyUmFuZ2VJdGVyYXRvciRtb2R1bGV0AEBMc2NhbGEvY29sbGVjdGlvbi9wYXJhbGxlbC9pbW11dGFibGUvUGFyUmFuZ2UkUGFyUmFuZ2VJdGVyYXRvciQ7TAAPU2NhbkxlYWYkbW9kdWxldAA1THNjYWxhL2NvbGxlY3Rpb24vcGFyYWxsZWwvUGFySXRlcmFibGVMaWtlJFNjYW5MZWFmJDtMAA9TY2FuTm9kZSRtb2R1bGV0ADVMc2NhbGEvY29sbGVjdGlvbi9wYXJhbGxlbC9QYXJJdGVyYWJsZUxpa2UkU2Nhbk5vZGUkO0wABXJhbmdldAAiTHNjYWxhL2NvbGxlY3Rpb24vaW1tdXRhYmxlL1JhbmdlO3hwcHBwc3IAIHNjYWxhLmNvbGxlY3Rpb24uaW1tdXRhYmxlLlJhbmdlabujVKsVMg0CAAdJAANlbmRaAAdpc0VtcHR5SQALbGFzdEVsZW1lbnRJABBudW1SYW5nZUVsZW1lbnRzSQAFc3RhcnRJAARzdGVwSQAPdGVybWluYWxFbGVtZW50eHAAAAABAAAAAAAAAAABAAAAAAAAAAIAAAAC")
   // TODO SI-8576 unstable under -Xcheckinit