diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceLowering.kt index 83c7271d164..e44bd1e8b2a 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/InterfaceLowering.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.descriptors.annotations.AnnotationsImpl +import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl import org.jetbrains.kotlin.ir.declarations.IrClass @@ -105,20 +105,20 @@ internal fun createStaticFunctionWithReceivers( ): SimpleFunctionDescriptorImpl { val newFunction = SimpleFunctionDescriptorImpl.create( owner, - AnnotationsImpl(emptyList()), + Annotations.EMPTY, name, CallableMemberDescriptor.Kind.DECLARATION, descriptor.source ) var offset = 0 val dispatchReceiver = ValueParameterDescriptorImpl.createWithDestructuringDeclarations( - newFunction, null, offset++, AnnotationsImpl(emptyList()), Name.identifier("this"), + newFunction, null, offset++, Annotations.EMPTY, Name.identifier("this"), dispatchReceiverType, false, false, false, null, descriptor.source, null ) val extensionReceiver = descriptor.extensionReceiverParameter?.let { extensionReceiver -> ValueParameterDescriptorImpl.createWithDestructuringDeclarations( - newFunction, null, offset++, AnnotationsImpl(emptyList()), Name.identifier("receiver"), + newFunction, null, offset++, Annotations.EMPTY, Name.identifier("receiver"), extensionReceiver.value.type, false, false, false, null, extensionReceiver.source, null ) } diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/descriptorUtils.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/descriptorUtils.kt index d3c3040052e..9c1289929ef 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/descriptorUtils.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/descriptorUtils.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.backend.jvm.lower import org.jetbrains.kotlin.backend.common.lower.InitializersLowering import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.descriptors.annotations.AnnotationsImpl +import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl import org.jetbrains.kotlin.name.Name @@ -29,7 +29,7 @@ fun FunctionDescriptor.toStatic( dispatchReceiverClass: ClassDescriptor? = this.containingDeclaration as? ClassDescriptor ): FunctionDescriptor { val newFunction = SimpleFunctionDescriptorImpl.create( - newOwner, AnnotationsImpl(emptyList()), + newOwner, Annotations.EMPTY, name, CallableMemberDescriptor.Kind.DECLARATION, this.source ) @@ -37,14 +37,14 @@ fun FunctionDescriptor.toStatic( var offset = 0 val dispatchReceiver = dispatchReceiverParameter?.let { ValueParameterDescriptorImpl.createWithDestructuringDeclarations( - newFunction, null, offset++, AnnotationsImpl(emptyList()), Name.identifier("this"), + newFunction, null, offset++, Annotations.EMPTY, Name.identifier("this"), dispatchReceiverClass!!.defaultType, false, false, false, null, dispatchReceiverClass.source, null ) } val extensionReceiver = extensionReceiverParameter?.let { ValueParameterDescriptorImpl.createWithDestructuringDeclarations( - newFunction, null, offset++, AnnotationsImpl(emptyList()), Name.identifier("receiver"), + newFunction, null, offset++, Annotations.EMPTY, Name.identifier("receiver"), it.value.type, false, false, false, null, it.source, null ) }