From 6e3b1fd9199a8d11a2b251281f9e31a35b8efba9 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Tue, 23 Mar 2021 13:14:28 +0100 Subject: [PATCH] [Commonizer] RootMerger: Change priorities for typeResolver This will prioritize classifiers from the following sources in the provided order 1) Classifiers from the target's modulesProvider 2) Classifiers from the traget's direct dependencies 3) Classifiers from the more common dependencies --- .../kotlin/commonizer/mergedtree/mergers/RootMerger.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/mergers/RootMerger.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/mergers/RootMerger.kt index 34c6c166663..5262e1baa49 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/mergers/RootMerger.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/mergers/RootMerger.kt @@ -5,10 +5,12 @@ package org.jetbrains.kotlin.commonizer.mergedtree.mergers -import org.jetbrains.kotlin.commonizer.* +import org.jetbrains.kotlin.commonizer.CommonizerParameters +import org.jetbrains.kotlin.commonizer.CommonizerTarget +import org.jetbrains.kotlin.commonizer.ModulesProvider import org.jetbrains.kotlin.commonizer.mergedtree.* -import org.jetbrains.kotlin.commonizer.mergedtree.buildRootNode import org.jetbrains.kotlin.commonizer.metadata.CirTypeResolver +import org.jetbrains.kotlin.commonizer.prettyName import org.jetbrains.kotlin.storage.StorageManager internal class RootMerger( @@ -30,9 +32,9 @@ internal class RootMerger( val (commonModuleInfos, missingModuleInfos) = allModuleInfos.partition { it.name in commonModuleNames } val typeResolver = CirTypeResolver.create( providedClassifiers = CirProvidedClassifiers.of( - classifiers.commonDependencies, + CirProvidedClassifiers.by(targetProvider.modulesProvider), CirProvidedClassifiers.by(targetProvider.dependencyModulesProvider), - CirProvidedClassifiers.by(targetProvider.modulesProvider) + classifiers.commonDependencies ) ) targetMerger.processTarget(