diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt index 2acab1b6317..9a20342f7f8 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/GeneratorHelpers.kt @@ -116,7 +116,7 @@ interface IrBuilderExtension { irInvoke( dispatchReceiver, callee, - args = valueArguments.toTypedArray(), + *valueArguments.toTypedArray(), typeHint = returnTypeHint ).also { call -> typeArguments.forEachIndexed(call::putTypeArgument) } @@ -590,7 +590,7 @@ interface IrBuilderExtension { kType, genericIndex ) { it, _ -> - val (prop, ir) = enclosingGenerator.localSerializersFieldsDescriptors[it] + val (_, ir) = enclosingGenerator.localSerializersFieldsDescriptors[it] irGetField(irGet(dispatchReceiverParameter), ir.backingField!!) } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerForInlineClassGenerator.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerForInlineClassGenerator.kt index 6ad6cce9d9c..e684ad06999 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerForInlineClassGenerator.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerForInlineClassGenerator.kt @@ -80,7 +80,7 @@ class SerializerForInlineClassGenerator( }, { decoderClass.referenceMethod("${CallingConventions.decode}${it.elementMethodPrefix}") to listOf() }, returnTypeHint = inlinedType) - val value = coerceToBox(actualCall, inlinedType, loadFunc.returnType) + val value = coerceToBox(actualCall, loadFunc.returnType) +irReturn(value) } @@ -101,7 +101,7 @@ class SerializerForInlineClassGenerator( // Compiler will elide these in corresponding inline class lowerings (when serialize/deserialize functions will be split in two) - private fun IrBlockBodyBuilder.coerceToBox(expression: IrExpression, propertyType: IrType, inlineClassBoxType: IrType): IrExpression = + private fun IrBlockBodyBuilder.coerceToBox(expression: IrExpression, inlineClassBoxType: IrType): IrExpression = irInvoke( null, serializableIrClass.constructors.single { it.isPrimary }.symbol, diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt index d830bc55b1c..b6d23e642e4 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/ir/SerializerIrGenerator.kt @@ -70,8 +70,8 @@ open class SerializerIrGenerator( prop = generateSimplePropertyWithBackingField(desc, irClass) // TODO: Do not use descriptors here - localSerializersFieldsDescriptors = findLocalSerializersFieldDescriptors().map { it -> - it to generateSimplePropertyWithBackingField(it, irClass) + localSerializersFieldsDescriptors = findLocalSerializersFieldDescriptors().map { descriptor -> + descriptor to generateSimplePropertyWithBackingField(descriptor, irClass) } }