From 2e55d212a418fb3afd736cbc08703d7a9ca83512 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Mon, 10 Feb 2020 12:25:21 +0100 Subject: [PATCH] [interop] adoption of e8fba8bcb68c4b84396674b7d5e472d1860754ac --- .../konan/ir/interop/DescriptorToIrTranslationUtils.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/DescriptorToIrTranslationUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/DescriptorToIrTranslationUtils.kt index a9f842e53b7..ead36902614 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/DescriptorToIrTranslationUtils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ir/interop/DescriptorToIrTranslationUtils.kt @@ -82,7 +82,7 @@ internal interface DescriptorToIrTranslationMixin { SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, IrDeclarationOrigin.IR_EXTERNAL_DECLARATION_STUB, constructorDescriptor ) - constructorDescriptor.valueParameters.mapTo(irConstructor.valueParameters) { valueParameterDescriptor -> + irConstructor.valueParameters += constructorDescriptor.valueParameters.map { valueParameterDescriptor -> symbolTable.declareValueParameter( SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, IrDeclarationOrigin.DEFINED, valueParameterDescriptor, @@ -123,7 +123,7 @@ internal interface DescriptorToIrTranslationMixin { val irFunction = symbolTable.declareSimpleFunctionWithOverrides(SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, origin, functionDescriptor) symbolTable.withScope(functionDescriptor) { irFunction.returnType = functionDescriptor.returnType!!.toIrType() - functionDescriptor.valueParameters.mapTo(irFunction.valueParameters) { + irFunction.valueParameters += functionDescriptor.valueParameters.map { symbolTable.declareValueParameter(SYNTHETIC_OFFSET, SYNTHETIC_OFFSET, IrDeclarationOrigin.DEFINED, it, it.type.toIrType()) } irFunction.dispatchReceiverParameter = functionDescriptor.dispatchReceiverParameter?.let { @@ -135,7 +135,7 @@ internal interface DescriptorToIrTranslationMixin { } private fun IrDeclaration.generateAnnotations() { - descriptor.annotations.mapTo(annotations) { + annotations += descriptor.annotations.map { typeTranslator.constantValueGenerator.generateAnnotationConstructorCall(it)!! } }