From 26bec6f739b85258339a64a5b2dc1cece6fb39f1 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Thu, 27 Aug 2020 11:40:21 +0300 Subject: [PATCH] Corresponding fix to js de-descriptiozation (cherry picked from commit f542026312055e0ed49846f4dc76500ad1f44a32) --- .../org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt | 2 +- .../kotlin/backend/konan/lower/EnumConstructorsLowering.kt | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt index e648198da8e..dfffe9bb5be 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/Autoboxing.kt @@ -494,7 +494,7 @@ private val Context.getLoweredInlineClassConstructor: (IrConstructor) -> IrSimpl require(irConstructor.constructedClass.isInlined()) require(!irConstructor.isPrimary) - val descriptor = WrappedSimpleFunctionDescriptor(irConstructor.descriptor.annotations, irConstructor.descriptor.source) + val descriptor = WrappedSimpleFunctionDescriptor() IrFunctionImpl( irConstructor.startOffset, irConstructor.endOffset, IrDeclarationOrigin.DEFINED, diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt index ef6467dcda7..fd285cc1143 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/EnumConstructorsLowering.kt @@ -109,10 +109,7 @@ internal class EnumConstructorsLowering(val context: Context) : ClassLoweringPas private fun lowerEnumConstructor(constructor: IrConstructor): IrConstructor { val startOffset = constructor.startOffset val endOffset = constructor.endOffset - val loweredConstructor = WrappedClassConstructorDescriptor( - constructor.descriptor.annotations, - constructor.descriptor.source - ).let { + val loweredConstructor = WrappedClassConstructorDescriptor().let { IrConstructorImpl( startOffset, endOffset, constructor.origin,