[FIR] Search for typealias in dependencies, if expect class was found first

^KT-65840 Fixed

compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractFirDeserializedSymbolProvider.kt

@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.fir.caches.createCache
 import org.jetbrains.kotlin.fir.caches.firCachesFactory
 import org.jetbrains.kotlin.fir.caches.getValue
 import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin
+import org.jetbrains.kotlin.fir.declarations.utils.isExpect
 import org.jetbrains.kotlin.fir.isNewPlaceForBodyGeneration
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolNamesProvider
 import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
@@ -322,6 +323,25 @@ abstract class AbstractFirDeserializedSymbolProvider(
     }
 
     override fun getClassLikeSymbolByClassId(classId: ClassId): FirClassLikeSymbol<*>? {
-        return getClass(classId) ?: getTypeAlias(classId)
+        /**
+         * FIR has a contract that providers should return the first classifier with required classId they found.
+         *
+         * But on the other hand, there is a contract (from pre 1.0 times), that classes have more priority than typealiases,
+         *   when search is performed in binary dependencies.
+         *
+         * And the second contract breaks the first in case, when there are two parts of a MPP library:
+         * - one is platform one and contains `actual typealias`
+         * - second is common one and contains `expect class`
+         *
+         * In this case, by the first contract, provider will return `expect class`, but FIR expects that `actual typealias` will be found
+         * So, to avoid this problem, we need to search for typealias in case, when `expect class` was found
+         *
+         * For details see KT-65840
+         */
+        val clazz = getClass(classId)
+        if (clazz != null && !clazz.isExpect) {
+            return clazz
+        }
+        return getTypeAlias(classId) ?: clazz
     }
 }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/K2Tests.kt

@@ -220,6 +220,16 @@ class CustomK2Tests : KGPBaseTest() {
             }
         }
     }
+
+    @GradleTest
+    @DisplayName("Native metadata compilation against other klib (KT-65840)")
+    fun nativeMetadataCompilationWithAgainstOtherKlib(gradleVersion: GradleVersion) {
+        project("k2-common-native-against-other-klib", gradleVersion) {
+            build(":app:compileNativeMainKotlinMetadata") {
+                assertTasksExecuted(":app:compileNativeMainKotlinMetadata")
+            }
+        }
+    }
 }
 
 @NativeGradlePluginTests

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/k2-common-native-against-other-klib/app/build.gradle.kts

@@ -0,0 +1,7 @@
+kotlin {
+    sourceSets {
+        commonMain.dependencies {
+            implementation(project(":lib"))
+        }
+    }
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/k2-common-native-against-other-klib/app/src/nativeMain/kotlin/Main.native.kt

@@ -0,0 +1,3 @@
+fun test() {
+    val s: Some = createSome()
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/k2-common-native-against-other-klib/build.gradle.kts

@@ -0,0 +1,37 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
+
+group = "test"
+version = "1.0"
+
+plugins {
+    kotlin("multiplatform")
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+subprojects {
+    apply {
+        plugin("kotlin-multiplatform")
+    }
+
+    kotlin {
+        applyDefaultHierarchyTemplate()
+        linuxX64()
+        macosX64()
+    }
+
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    tasks.withType<KotlinCompilationTask<*>>().configureEach {
+        compilerOptions {
+            freeCompilerArgs.add("-Xrender-internal-diagnostic-names")
+        }
+    }
+}
+

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/k2-common-native-against-other-klib/lib/src/commonMain/kotlin/Lib.common.kt

@@ -0,0 +1,3 @@
+expect class Some {
+    fun foo()
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/k2-common-native-against-other-klib/lib/src/nativeMain/kotlin/Main.native.kt

@@ -0,0 +1,7 @@
+class Other {
+    fun foo() {}
+}
+
+actual typealias Some = Other
+
+fun createSome(): Some = Other()

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/k2-common-native-against-other-klib/settings.gradle.kts

@@ -0,0 +1 @@
+include(":app", ":lib")