diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/CommonizerParameters.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/CommonizerParameters.kt index 6042c1884fe..41a0f8f3286 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/CommonizerParameters.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/CommonizerParameters.kt @@ -22,7 +22,7 @@ class CommonizerParameters( fun CommonizerParameters.getCommonModuleNames(): Set { val supportedTargets = targetProviders.filterNonNull() - if (supportedTargets.size < 2) return emptySet() // too few targets + if (supportedTargets.size == 0) return emptySet() // Nothing to do val allModuleNames: List> = supportedTargets.toList().map { targetProvider -> targetProvider.modulesProvider.loadModuleInfos().mapTo(HashSet()) { it.name } diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/facade.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/facade.kt index 89b09c86031..a2e95eb2f42 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/facade.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/facade.kt @@ -82,9 +82,6 @@ private fun merge( /* Nothing to merge */ if (availableTrees.size == 0) return null - /* No propagation from leaves */ - if (availableTrees.size == 1 && availableTrees.targets.single() is LeafCommonizerTarget) return null - return mergeCirTree(storageManager, classifiers, availableTrees) } diff --git a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/CommonizerFacadeTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/CommonizerFacadeTest.kt index bbcc9aa7456..4ab6e1ba508 100644 --- a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/CommonizerFacadeTest.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/CommonizerFacadeTest.kt @@ -24,13 +24,6 @@ class CommonizerFacadeTest { emptyMap() ) - @Test - fun nothingToCommonize1() = doTestNothingToCommonize( - mapOf( - "target1" to listOf("foo") - ) - ) - @Test fun commonized1() = doTestSuccessfulCommonization( mapOf( @@ -47,6 +40,13 @@ class CommonizerFacadeTest { ) ) + @Test + fun commonized3() = doTestSuccessfulCommonization( + mapOf( + "target1" to listOf("foo") + ) + ) + @Test fun commonizedWithDifferentModules() = doTestNothingToCommonize( mapOf(