Merge branch 'JetBrains:master' into zip-cache

Author: aviroop-123

analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLBlackBoxTestGenerated.java

@@ -8129,7 +8129,7 @@
                                                     "introducedVersion": "1.1.3",
                                                     "stabilizedVersion": null,
                                                     "deprecatedVersion": "2.1.0",
-                                                    "removedVersion": null
+                                                    "removedVersion": "2.3.0"
                                                 }
                                             },
                                             {

analysis/low-level-api-fir/tests-gen/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLReversedBlackBoxTestGenerated.java

@@ -539,9 +539,6 @@ val actualJsArguments by compilerArgumentsLevel(CompilerArgumentsLevelNames.jsAr
 It is deprecated and will be removed in a future release.""".asReleaseDependent()
         valueType = BooleanType.defaultFalse
 
-        additionalAnnotations(
-            Deprecated("It is senseless to use with IR compiler. Only for compatibility."),
-        )
         additionalMetadata(
             GradleOption(
                 value = DefaultValue.BOOLEAN_FALSE_DEFAULT,
@@ -558,6 +555,7 @@ It is deprecated and will be removed in a future release.""".asReleaseDependent(
         lifecycle(
             introducedVersion = KotlinReleaseVersion.v1_1_3,
             deprecatedVersion = KotlinReleaseVersion.v2_1_0,
+            removedVersion = KotlinReleaseVersion.v2_3_0,
         )
     }
 

compiler/arguments/resources/kotlin-compiler-arguments.json

@@ -253,7 +253,9 @@ class AnonymousObjectTransformer(
                 }
                 return@action
             }
-            DescriptorAsmUtil.writeAnnotationData(av, newProto, newStringTable)
+            AsmUtil.writeAnnotationData(
+                av, JvmProtoBufUtil.writeData(newProto, newStringTable), ArrayUtil.toStringArray(newStringTable.strings),
+            )
         }
     }
 

compiler/arguments/src/org/jetbrains/kotlin/arguments/description/JsCompilerArguments.kt

@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.codegen.state
 
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.codegen.signature.AsmTypeFactory
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
@@ -18,6 +19,7 @@ import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.TypeSystemCommonBackendContext
 import org.jetbrains.kotlin.types.checker.SimpleClassicTypeSystemContext
 import org.jetbrains.kotlin.types.model.KotlinTypeMarker
+import org.jetbrains.kotlin.types.typeUtil.builtIns
 import org.jetbrains.org.objectweb.asm.Type
 
 // This class exists only because it's used to box/unbox inline classes in the static method StackValue.coerce in the old backend, which
@@ -26,7 +28,7 @@ object StaticTypeMapperForOldBackend : KotlinTypeMapperBase() {
     override val typeSystem: TypeSystemCommonBackendContext
         get() = SimpleClassicTypeSystemContext
 
-    private val staticTypeMappingConfiguration = object : TypeMappingConfiguration<Type> {
+    private class Configuration(override val builtIns: KotlinBuiltIns) : TypeMappingConfiguration<Type> {
         override fun commonSupertype(types: Collection<KotlinType>): KotlinType {
             return CommonSupertypes.commonSupertype(types)
         }
@@ -51,7 +53,7 @@ object StaticTypeMapperForOldBackend : KotlinTypeMapperBase() {
     override fun mapClass(classifier: ClassifierDescriptor): Type = TODO("Should not be called")
 
     override fun mapTypeCommon(type: KotlinTypeMarker, mode: TypeMappingMode): Type {
-        return mapType(type as KotlinType, AsmTypeFactory, mode, staticTypeMappingConfiguration, null)
+        return mapType(type as KotlinType, AsmTypeFactory, mode, Configuration(type.builtIns), null)
     }
 
     private fun generateErrorMessageForErrorType(type: KotlinType, descriptor: DeclarationDescriptor): String {

compiler/backend/src/org/jetbrains/kotlin/codegen/DescriptorAsmUtil.java

@@ -356,16 +356,6 @@ public interface JsArguments : WasmArguments {
     @ExperimentalCompilerArgument
     public val X_ES_LONG_AS_BIGINT: JsArgument<Boolean?> = JsArgument("X_ES_LONG_AS_BIGINT")
 
-    /**
-     * This option does nothing and is left for compatibility with the legacy backend.
-     * It is deprecated and will be removed in a future release.
-     *
-     * WARNING: this option is EXPERIMENTAL and it may be changed in the future without notice or may be removed entirely.
-     */
-    @JvmField
-    @ExperimentalCompilerArgument
-    public val X_TYPED_ARRAYS: JsArgument<Boolean> = JsArgument("X_TYPED_ARRAYS")
-
     /**
      * Disable internal declaration export.
      *

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.kt

@@ -56,7 +56,6 @@ import org.jetbrains.kotlin.buildtools.api.arguments.JsArguments.Companion.X_IR_
 import org.jetbrains.kotlin.buildtools.api.arguments.JsArguments.Companion.X_OPTIMIZE_GENERATED_JS
 import org.jetbrains.kotlin.buildtools.api.arguments.JsArguments.Companion.X_PLATFORM_ARGUMENTS_IN_MAIN_FUNCTION
 import org.jetbrains.kotlin.buildtools.api.arguments.JsArguments.Companion.X_STRICT_IMPLICIT_EXPORT_TYPES
-import org.jetbrains.kotlin.buildtools.api.arguments.JsArguments.Companion.X_TYPED_ARRAYS
 import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
 
 public class JsArgumentsImpl : WasmArgumentsImpl(), JsArguments {
@@ -110,7 +109,6 @@ public class JsArgumentsImpl : WasmArgumentsImpl(), JsArguments {
     if ("X_ES_GENERATORS" in optionsMap) { arguments.useEsGenerators = get(X_ES_GENERATORS) }
     if ("X_ES_ARROW_FUNCTIONS" in optionsMap) { arguments.useEsArrowFunctions = get(X_ES_ARROW_FUNCTIONS) }
     if ("X_ES_LONG_AS_BIGINT" in optionsMap) { arguments.compileLongAsBigInt = get(X_ES_LONG_AS_BIGINT) }
-    if ("X_TYPED_ARRAYS" in optionsMap) { arguments.typedArrays = get(X_TYPED_ARRAYS) }
     if ("X_FRIEND_MODULES_DISABLED" in optionsMap) { arguments.friendModulesDisabled = get(X_FRIEND_MODULES_DISABLED) }
     if ("X_FRIEND_MODULES" in optionsMap) { arguments.friendModules = get(X_FRIEND_MODULES) }
     if ("X_ENABLE_EXTENSION_FUNCTIONS_IN_EXTERNALS" in optionsMap) { arguments.extensionFunctionsInExternals = get(X_ENABLE_EXTENSION_FUNCTIONS_IN_EXTERNALS) }