diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPackage.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPackage.kt index 7ab72b86677..bb04c942fe8 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPackage.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirPackage.kt @@ -7,4 +7,13 @@ package org.jetbrains.kotlin.descriptors.commonizer.cir interface CirPackage : CirDeclaration { val packageName: CirPackageName + + companion object { + @Suppress("NOTHING_TO_INLINE") + inline fun create(packageName: CirPackageName): CirPackage = CirPackageImpl(packageName) + } } + +data class CirPackageImpl( + override val packageName: CirPackageName +) : CirPackage diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPackageFactory.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPackageFactory.kt deleted file mode 100644 index cdfcf857baa..00000000000 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/factory/CirPackageFactory.kt +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.descriptors.commonizer.cir.factory - -import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackage -import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackageName -import org.jetbrains.kotlin.descriptors.commonizer.cir.impl.CirPackageImpl - -object CirPackageFactory { - fun create(packageName: CirPackageName): CirPackage = CirPackageImpl(packageName) -} diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPackageImpl.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPackageImpl.kt deleted file mode 100644 index 9f4e0f8b000..00000000000 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/impl/CirPackageImpl.kt +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.descriptors.commonizer.cir.impl - -import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackage -import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackageName - -data class CirPackageImpl( - override val packageName: CirPackageName -) : CirPackage diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PackageCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PackageCommonizer.kt index 5fa9dc2b15e..143633a84c8 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PackageCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/PackageCommonizer.kt @@ -7,12 +7,11 @@ package org.jetbrains.kotlin.descriptors.commonizer.core import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackage import org.jetbrains.kotlin.descriptors.commonizer.cir.CirPackageName -import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirPackageFactory class PackageCommonizer : AbstractStandardCommonizer() { private lateinit var packageName: CirPackageName - override fun commonizationResult() = CirPackageFactory.create(packageName = packageName) + override fun commonizationResult() = CirPackage.create(packageName = packageName) override fun initialize(first: CirPackage) { packageName = first.packageName diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt index e6c42f2f85a..f79517ba123 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/CirTreeMerger.kt @@ -166,7 +166,7 @@ class CirTreeMerger( val packageNode: CirPackageNode = moduleNode.packages.getOrPut(packageName) { buildPackageNode(storageManager, leafTargetsSize) } - packageNode.targetDeclarations[context.targetIndex] = CirPackageFactory.create(packageName) + packageNode.targetDeclarations[context.targetIndex] = CirPackage.create(packageName) val classesToProcess = ClassesToProcess() fragments.forEach { fragment ->