diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt index e2d03a1a80c..5e5ea0902ef 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt @@ -41,12 +41,9 @@ private fun mergeAndCommonize(storageManager: StorageManager, parameters: Common val classifiers = CirKnownClassifiers( commonizedNodes = CirCommonizedClassifierNodes.default(), forwardDeclarations = CirForwardDeclarations.default(), - dependencies = mapOf( - // for now, supply only common dependency libraries (ex: Kotlin stdlib) - parameters.sharedTarget to CirCompositeClassifiers( - CirFictitiousFunctionClassifiers, - CirLoadedClassifiers.from(parameters.dependencyModulesProvider) - ) + commonDependencies = CirCompositeClassifiers( + CirFictitiousFunctionClassifiers, + CirLoadedClassifiers.from(parameters.dependencyModulesProvider) ) ) val mergeResult = CirTreeMerger(storageManager, classifiers, parameters).merge() diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/classifierContainers.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/classifierContainers.kt index 1a8a5af8628..c1c49332180 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/classifierContainers.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/mergedtree/classifierContainers.kt @@ -7,20 +7,14 @@ package org.jetbrains.kotlin.descriptors.commonizer.mergedtree import gnu.trove.THashMap import gnu.trove.THashSet -import org.jetbrains.kotlin.descriptors.commonizer.CommonizerTarget -import org.jetbrains.kotlin.descriptors.commonizer.SharedCommonizerTarget import org.jetbrains.kotlin.descriptors.commonizer.cir.CirEntityId import org.jetbrains.kotlin.descriptors.commonizer.utils.isUnderKotlinNativeSyntheticPackages class CirKnownClassifiers( val commonizedNodes: CirCommonizedClassifierNodes, val forwardDeclarations: CirForwardDeclarations, - val dependencies: Map -) { - // a shortcut for fast access - val commonDependencies: CirProvidedClassifiers = - dependencies.filterKeys { it is SharedCommonizerTarget }.values.singleOrNull() ?: CirProvidedClassifiers.EMPTY -} + val commonDependencies: CirProvidedClassifiers +) /** A set of all CIR nodes built for commonized classes and type aliases. */ interface CirCommonizedClassifierNodes { diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt index f0973a2677b..a38dd76335c 100644 --- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/core/TypeCommonizerTest.kt @@ -7,8 +7,6 @@ package org.jetbrains.kotlin.descriptors.commonizer.core import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor -import org.jetbrains.kotlin.descriptors.commonizer.LeafCommonizerTarget -import org.jetbrains.kotlin.descriptors.commonizer.SharedCommonizerTarget import org.jetbrains.kotlin.descriptors.commonizer.cir.CirEntityId import org.jetbrains.kotlin.descriptors.commonizer.cir.CirType import org.jetbrains.kotlin.descriptors.commonizer.cir.factory.CirClassFactory @@ -35,11 +33,9 @@ class TypeCommonizerTest : AbstractCommonizerTest() { classifiers = CirKnownClassifiers( commonizedNodes = CirCommonizedClassifierNodes.default(), forwardDeclarations = CirForwardDeclarations.default(), - dependencies = mapOf( - FAKE_SHARED_TARGET to object : CirProvidedClassifiers { - override fun hasClassifier(classifierId: CirEntityId): Boolean = classifierId.packageName.isUnderStandardKotlinPackages - } - ) + commonDependencies = object : CirProvidedClassifiers { + override fun hasClassifier(classifierId: CirEntityId): Boolean = classifierId.packageName.isUnderStandardKotlinPackages + } ) } @@ -537,8 +533,6 @@ class TypeCommonizerTest : AbstractCommonizerTest() { fun areEqual(classifiers: CirKnownClassifiers, a: CirType, b: CirType): Boolean = TypeCommonizer(classifiers).run { commonizeWith(a) && commonizeWith(b) } - private val FAKE_SHARED_TARGET = SharedCommonizerTarget(setOf(LeafCommonizerTarget("a"), LeafCommonizerTarget("b"))) - private fun CirKnownClassifiers.classNode(classId: CirEntityId, computation: () -> CirClassNode) = commonizedNodes.classNode(classId) ?: computation() diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt index ad81b942d2c..6051408180d 100644 --- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt @@ -153,7 +153,7 @@ internal val MOCK_CLASSIFIERS = CirKnownClassifiers( override fun isExportedForwardDeclaration(classId: CirEntityId) = false override fun addExportedForwardDeclaration(classId: CirEntityId) = error("This method should not be called") }, - dependencies = emptyMap() + commonDependencies = CirProvidedClassifiers.EMPTY ) internal class MockModulesProvider private constructor(