Serialization: remove potential data race during extension registration

RCA: Before this commit, serialization plugin performed its protobuf
extension registration during its own initialization. This could provoke
a data race between one thread without serialization already doing some
work with protobuf and another thread with serialization registering
this extension in parallel thus changing the same HashMap. Also,
after the commit ea46a4f
we got exactly 12 standard protobuf extensions, and one more from
serialization provokes rehashing in the map making this race possible
in practice. This commit makes registration for standard & serialization
extensions together, thus removing a possibility of the data race.

#KT-83984 Fixed
#KT-81700 Fixed
#KT-82473 Fixed
#KT-83339 Fixed

Author: mglukhikh

compiler/util-klib-metadata/src/org/jetbrains/kotlin/library/metadata/KlibMetadataSerializerProtocol.kt

@@ -5,11 +5,16 @@
 
 package org.jetbrains.kotlin.library.metadata
 
+import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf.registerAllExtensions
+import org.jetbrains.kotlin.metadata.SerializationPluginMetadataExtensions
 import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite
 import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
 
 object KlibMetadataSerializerProtocol : SerializerExtensionProtocol(
-    ExtensionRegistryLite.newInstance().apply(KlibMetadataProtoBuf::registerAllExtensions),
+    ExtensionRegistryLite.newInstance().apply {
+        registerAllExtensions(this)
+        SerializationPluginMetadataExtensions.registerAllExtensions(this)
+    },
     KlibMetadataProtoBuf.packageFqName,
     KlibMetadataProtoBuf.constructorAnnotation,
     KlibMetadataProtoBuf.classAnnotation,

core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/JvmProtoBufUtil.kt

@@ -6,8 +6,10 @@
 package org.jetbrains.kotlin.metadata.jvm.deserialization
 
 import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.SerializationPluginMetadataExtensions
 import org.jetbrains.kotlin.metadata.deserialization.*
 import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.registerAllExtensions
 import org.jetbrains.kotlin.metadata.jvm.serialization.JvmStringTable
 import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite
 import org.jetbrains.kotlin.protobuf.MessageLite
@@ -16,7 +18,10 @@ import java.io.ByteArrayOutputStream
 import java.io.InputStream
 
 object JvmProtoBufUtil {
-    val EXTENSION_REGISTRY: ExtensionRegistryLite = ExtensionRegistryLite.newInstance().apply(JvmProtoBuf::registerAllExtensions)
+    val EXTENSION_REGISTRY: ExtensionRegistryLite = ExtensionRegistryLite.newInstance().apply {
+        registerAllExtensions(this)
+        SerializationPluginMetadataExtensions.registerAllExtensions(this)
+    }
 
     const val PLATFORM_TYPE_ID = "kotlin.jvm.PlatformType"
 

js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsSerializerProtocol.kt

@@ -5,12 +5,17 @@
 
 package org.jetbrains.kotlin.serialization.js
 
+import org.jetbrains.kotlin.metadata.SerializationPluginMetadataExtensions
 import org.jetbrains.kotlin.metadata.js.JsProtoBuf
+import org.jetbrains.kotlin.metadata.js.JsProtoBuf.registerAllExtensions
 import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite
 import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
 
 object JsSerializerProtocol : SerializerExtensionProtocol(
-    ExtensionRegistryLite.newInstance().apply(JsProtoBuf::registerAllExtensions),
+    ExtensionRegistryLite.newInstance().apply {
+        registerAllExtensions(this)
+        SerializationPluginMetadataExtensions.registerAllExtensions(this)
+    },
     JsProtoBuf.packageFqName,
     JsProtoBuf.constructorAnnotation,
     JsProtoBuf.classAnnotation,

plugins/kotlinx-serialization/kotlinx-serialization.cli/src/org/jetbrains/kotlinx/serialization/compiler/extensions/SerializationComponentRegistrar.kt

@@ -14,13 +14,9 @@ import org.jetbrains.kotlin.container.useInstance
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
 import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter
-import org.jetbrains.kotlin.library.metadata.KlibMetadataSerializerProtocol
-import org.jetbrains.kotlin.metadata.SerializationPluginMetadataExtensions
-import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
 import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension
 import org.jetbrains.kotlin.serialization.DescriptorSerializerPlugin
-import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol
 import org.jetbrains.kotlinx.serialization.compiler.diagnostic.SerializationPluginDeclarationChecker
 import org.jetbrains.kotlinx.serialization.compiler.extensions.SerializationConfigurationKeys.DISABLE_INTRINSIC
 import org.jetbrains.kotlinx.serialization.compiler.fir.FirSerializationExtensionRegistrar
@@ -74,7 +70,6 @@ class SerializationComponentRegistrar : CompilerPluginRegistrar() {
             // So we create SerializationDescriptorSerializerPlugin only outside of IDE.
             val serializationDescriptorSerializer = SerializationDescriptorSerializerPlugin()
             DescriptorSerializerPlugin.registerExtension(serializationDescriptorSerializer)
-            registerProtoExtensions()
 
             SyntheticResolveExtension.registerExtension(SerializationResolveExtension(serializationDescriptorSerializer))
 
@@ -84,12 +79,6 @@ class SerializationComponentRegistrar : CompilerPluginRegistrar() {
 
             FirExtensionRegistrarAdapter.registerExtension(FirSerializationExtensionRegistrar())
         }
-
-        private fun registerProtoExtensions() {
-            SerializationPluginMetadataExtensions.registerAllExtensions(JvmProtoBufUtil.EXTENSION_REGISTRY)
-            SerializationPluginMetadataExtensions.registerAllExtensions(JsSerializerProtocol.extensionRegistry)
-            SerializationPluginMetadataExtensions.registerAllExtensions(KlibMetadataSerializerProtocol.extensionRegistry)
-        }
     }
 }