diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirExtensionReceiver.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirExtensionReceiver.kt index 7c195e45269..d044db5e55a 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirExtensionReceiver.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirExtensionReceiver.kt @@ -5,22 +5,7 @@ package org.jetbrains.kotlin.commonizer.cir -interface CirExtensionReceiver : CirHasAnnotations { - val type: CirType - - companion object { - @Suppress("NOTHING_TO_INLINE") - inline fun create( - annotations: List, - type: CirType - ): CirExtensionReceiver = CirExtensionReceiverImpl( - annotations = annotations, - type = type - ) - } -} - -data class CirExtensionReceiverImpl( +data class CirExtensionReceiver( override val annotations: List, - override val type: CirType -) : CirExtensionReceiver + val type: CirType +) : CirHasAnnotations diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ExtensionReceiverCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ExtensionReceiverCommonizer.kt index 8fb08760769..f18ca678744 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ExtensionReceiverCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ExtensionReceiverCommonizer.kt @@ -14,7 +14,7 @@ class ExtensionReceiverCommonizer(classifiers: CirKnownClassifiers) : wrappedCommonizerFactory = { TypeCommonizer(classifiers).asCommonizer() }, extractor = { it.type }, builder = { receiverType -> - CirExtensionReceiver.create( + CirExtensionReceiver( annotations = emptyList(), type = receiverType ) diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt index ef193a6fc3e..ee95516f058 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt @@ -84,7 +84,7 @@ object CirDeserializers { private fun extensionReceiver( receiverParameterType: KmType, typeResolver: CirTypeResolver - ): CirExtensionReceiver = CirExtensionReceiver.create( + ): CirExtensionReceiver = CirExtensionReceiver( annotations = emptyList(), // TODO nowhere to read receiver annotations from, see KT-42490 type = type(receiverParameterType, typeResolver) ) diff --git a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/ExtensionReceiverCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/ExtensionReceiverCommonizerTest.kt index a7e877cf463..0af81cb9569 100644 --- a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/ExtensionReceiverCommonizerTest.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/core/ExtensionReceiverCommonizerTest.kt @@ -50,7 +50,7 @@ class ExtensionReceiverCommonizerTest : AbstractCommonizerTest