KLIB Loading, Native: Don't use CommonKlibResolver in Native tests

Use a new entry point instead: loadNativeKlibsInTestPipeline().

^KT-65837

Author: ddolovov

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt

@@ -12,25 +12,19 @@ import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.analyzer.common.CommonDependenciesContainer
 import org.jetbrains.kotlin.analyzer.common.CommonPlatformAnalyzerServices
 import org.jetbrains.kotlin.analyzer.common.CommonResolverForModuleFactory
-import org.jetbrains.kotlin.backend.common.CommonKLibResolver
 import org.jetbrains.kotlin.backend.common.reportLoadingProblemsIfAny
 import org.jetbrains.kotlin.builtins.DefaultBuiltIns
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.builtins.jvm.JvmBuiltIns
 import org.jetbrains.kotlin.builtins.konan.KonanBuiltIns
-import org.jetbrains.kotlin.cli.common.messages.getLogger
 import org.jetbrains.kotlin.cli.js.klib.TopDownAnalyzerFacadeForJSIR
 import org.jetbrains.kotlin.cli.js.klib.TopDownAnalyzerFacadeForWasm
 import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider
 import org.jetbrains.kotlin.cli.jvm.compiler.NoScopeRecordCliBindingTrace
 import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM
 import org.jetbrains.kotlin.codegen.forTestCompile.TestCompilePaths.KOTLIN_MOCKJDK_RUNTIME_PATH
-import org.jetbrains.kotlin.config.CompilerConfiguration
-import org.jetbrains.kotlin.config.JVMConfigurationKeys
+import org.jetbrains.kotlin.config.*
 import org.jetbrains.kotlin.config.JVMConfigurationKeys.JVM_TARGET
-import org.jetbrains.kotlin.config.JvmTarget
-import org.jetbrains.kotlin.config.LanguageFeature
-import org.jetbrains.kotlin.config.languageVersionSettings
 import org.jetbrains.kotlin.container.get
 import org.jetbrains.kotlin.context.ModuleContext
 import org.jetbrains.kotlin.context.ProjectContext
@@ -84,6 +78,7 @@ import org.jetbrains.kotlin.test.services.*
 import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator
 import org.jetbrains.kotlin.test.services.configuration.NativeEnvironmentConfigurator
 import org.jetbrains.kotlin.test.services.configuration.getDependencies
+import org.jetbrains.kotlin.test.services.configuration.nativeEnvironmentConfigurator
 import org.jetbrains.kotlin.test.util.KtTestUtil
 import org.jetbrains.kotlin.utils.addToStdlib.runIf
 import org.jetbrains.kotlin.utils.closure
@@ -310,43 +305,6 @@ class ClassicFrontendFacade(
         }
     }
 
-    // TODO (KT-65837): This function is only used in Kotlin/Native. We shall use createModuleDescriptorsForKlibs() instead.
-    private fun loadKlib(
-        factories: KlibMetadataFactories,
-        names: List<String>,
-        configuration: CompilerConfiguration
-    ): List<ModuleDescriptor> {
-        val resolvedLibraries = CommonKLibResolver.resolve(
-            names,
-            configuration.getLogger(treatWarningsAsErrors = true),
-            knownIrProviders = listOf("kotlin.native.cinterop"), // FIXME use KonanLibraryProperResolver instead, as in production.
-        ).getFullResolvedList()
-
-        var builtInsModule: KotlinBuiltIns? = null
-        val dependencies = mutableListOf<ModuleDescriptorImpl>()
-
-        return resolvedLibraries.map { resolvedLibrary ->
-            testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryFile.absolutePath) {
-                val storageManager = LockBasedStorageManager("ModulesStructure")
-                val isBuiltIns = resolvedLibrary.library.isAnyPlatformStdlib
-
-                val moduleDescriptor = factories.DefaultDeserializedDescriptorFactory.createDescriptorOptionalBuiltIns(
-                    resolvedLibrary.library,
-                    configuration.languageVersionSettings,
-                    storageManager,
-                    builtInsModule,
-                    packageAccessHandler = null,
-                    lookupTracker = LookupTracker.DO_NOTHING
-                )
-                if (isBuiltIns) builtInsModule = moduleDescriptor.builtIns
-                dependencies += moduleDescriptor
-                moduleDescriptor.setDependencies(ArrayList(dependencies))
-
-                Pair(moduleDescriptor, resolvedLibrary.library)
-            }
-        }
-    }
-
     private fun performJsModuleResolve(
         module: TestModule,
         project: Project,
@@ -436,12 +394,19 @@ class ClassicFrontendFacade(
         val moduleTrace = NoScopeRecordCliBindingTrace(project)
         val runtimeKlibsNames = NativeEnvironmentConfigurator.getRuntimePathsForModule(module, testServices)
         val nativeFactories = KlibMetadataFactories(::KonanBuiltIns, NullFlexibleTypeDeserializer)
-        val runtimeKlibs = loadKlib(nativeFactories, runtimeKlibsNames, configuration).mapNotNull { it as? ModuleDescriptorImpl }
-        val stdlibBuiltInsModule = runtimeKlibs.single { it.name == Name.special("<stdlib>") }.builtIns.builtInsModule
+
+        val runtimeModuleDescriptors = createModuleDescriptorsForKlibs(
+            libraryPaths = runtimeKlibsNames,
+            klibPlatformChecker = KlibPlatformChecker.Native(testServices.nativeEnvironmentConfigurator.getNativeTarget(module).name),
+            factories = nativeFactories,
+            configuration = configuration,
+        )
+
+        val stdlibBuiltInsModule = runtimeModuleDescriptors.single { it.name == Name.special("<stdlib>") }.builtIns.builtInsModule
 
         val moduleContext = createModuleContext(
             module, project,
-            dependencyDescriptors = dependencyDescriptors + runtimeKlibs,
+            dependencyDescriptors = dependencyDescriptors + runtimeModuleDescriptors,
             friendsDescriptors = friendsDescriptors,
             dependsOnDescriptors = dependsOnDescriptors,
             capabilities = mapOf(

compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/TestFirNativeSessionFactory.kt

@@ -5,8 +5,7 @@
 
 package org.jetbrains.kotlin.test.frontend.fir
 
-import org.jetbrains.kotlin.backend.common.CommonKLibResolver
-import org.jetbrains.kotlin.cli.common.messages.getLogger
+import org.jetbrains.kotlin.backend.konan.serialization.loadNativeKlibsInTestPipeline
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.deserialization.ModuleDataProvider
@@ -17,6 +16,7 @@ import org.jetbrains.kotlin.test.services.configuration.NativeEnvironmentConfigu
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.test.model.TestModule
 import org.jetbrains.kotlin.test.services.TestServices
+import org.jetbrains.kotlin.test.services.configuration.nativeEnvironmentConfigurator
 
 object TestFirNativeSessionFactory {
     fun createLibrarySession(
@@ -28,11 +28,11 @@ object TestFirNativeSessionFactory {
         configuration: CompilerConfiguration,
         extensionRegistrars: List<FirExtensionRegistrar>,
     ): FirSession {
-        val resolvedLibraries = CommonKLibResolver.resolve(
-            getAllNativeDependenciesPaths(module, testServices),
-            configuration.getLogger(treatWarningsAsErrors = true),
-            knownIrProviders = listOf("kotlin.native.cinterop"), // FIXME use KonanLibraryProperResolver instead, as in production.
-        ).getFullResolvedList().map { it.library }
+        val libraries = loadNativeKlibsInTestPipeline(
+            configuration = configuration,
+            libraryPaths = getAllNativeDependenciesPaths(module, testServices),
+            nativeTarget = testServices.nativeEnvironmentConfigurator.getNativeTarget(module),
+        ).all
 
         val sharedLibrarySession = FirNativeSessionFactory.createSharedLibrarySession(
             mainModuleName,
@@ -42,7 +42,7 @@ object TestFirNativeSessionFactory {
         )
 
         return FirNativeSessionFactory.createLibrarySession(
-            resolvedLibraries,
+            libraries,
             sessionProvider,
             sharedLibrarySession,
             moduleDataProvider,

native/native.tests/tests/org/jetbrains/kotlin/konan/test/Fir2IrNativeResultsConverter.kt

@@ -106,8 +106,7 @@ class Fir2IrNativeResultsConverter(testServices: TestServices) : AbstractFir2IrR
 
     companion object {
         /**
-         * Unlike [org.jetbrains.kotlin.backend.common.CommonKLibResolver.resolve], which does not distinguish
-         * "default" (i.e., [KotlinLibrary.isDefault]) from "non-default" libraries, this function does that kind of distinction:
+         * Note: This function distinguishes "default" from "non-default" libraries:
          * - "default" libraries is anything implicitly added by the Kotlin/Native compiler. For example, stdlib & platform libraries.
          * - "non-default" libraries are the libraries that are explicitly passed to the compiler via compiler CLI arguments.
          *   In tests, these are the libraries that were explicitly specified by `// MODULE` test directives in test data.

native/native.tests/tests/org/jetbrains/kotlin/konan/test/NativeKlibSerializerFacade.kt

@@ -5,24 +5,23 @@
 
 package org.jetbrains.kotlin.konan.test
 
-import org.jetbrains.kotlin.backend.common.CommonKLibResolver
 import org.jetbrains.kotlin.backend.common.klibAbiVersionForManifest
 import org.jetbrains.kotlin.backend.common.serialization.IrSerializationSettings
 import org.jetbrains.kotlin.backend.common.serialization.SerializerOutput
 import org.jetbrains.kotlin.backend.common.serialization.metadata.KlibMetadataMonolithicSerializer
 import org.jetbrains.kotlin.backend.common.serialization.serializeModuleIntoKlib
 import org.jetbrains.kotlin.backend.konan.serialization.KonanIrModuleSerializer
+import org.jetbrains.kotlin.backend.konan.serialization.loadNativeKlibsInTestPipeline
 import org.jetbrains.kotlin.builtins.konan.KonanBuiltIns
-import org.jetbrains.kotlin.cli.common.messages.getLogger
 import org.jetbrains.kotlin.config.*
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.diagnostics.DiagnosticReporterFactory
 import org.jetbrains.kotlin.diagnostics.impl.BaseDiagnosticsCollector
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.ir.KtDiagnosticReporterWithImplicitIrBasedContext
-import org.jetbrains.kotlin.konan.library.KLIB_INTEROP_IR_PROVIDER_IDENTIFIER
 import org.jetbrains.kotlin.konan.library.impl.buildLibrary
-import org.jetbrains.kotlin.library.*
+import org.jetbrains.kotlin.library.KotlinLibrary
+import org.jetbrains.kotlin.library.KotlinLibraryVersioning
 import org.jetbrains.kotlin.library.metadata.KlibMetadataFactories
 import org.jetbrains.kotlin.library.metadata.NullFlexibleTypeDeserializer
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
@@ -32,7 +31,10 @@ import org.jetbrains.kotlin.test.directives.KlibBasedCompilerTestDirectives.SKIP
 import org.jetbrains.kotlin.test.frontend.classic.ModuleDescriptorProvider
 import org.jetbrains.kotlin.test.frontend.classic.moduleDescriptorProvider
 import org.jetbrains.kotlin.test.frontend.fir.getAllNativeDependenciesPaths
-import org.jetbrains.kotlin.test.model.*
+import org.jetbrains.kotlin.test.model.ArtifactKinds
+import org.jetbrains.kotlin.test.model.BinaryArtifacts
+import org.jetbrains.kotlin.test.model.FrontendKinds
+import org.jetbrains.kotlin.test.model.TestModule
 import org.jetbrains.kotlin.test.services.*
 import org.jetbrains.kotlin.test.services.configuration.NativeEnvironmentConfigurator.Companion.getKlibArtifactFile
 import org.jetbrains.kotlin.test.services.configuration.nativeEnvironmentConfigurator
@@ -119,11 +121,11 @@ abstract class AbstractNativeKlibSerializerFacade(
 
         val dependencyPaths = getAllNativeDependenciesPaths(module, testServices)
 
-        val library = CommonKLibResolver.resolve(
-            libraries = dependencyPaths + outputArtifact.outputFile.path,
-            logger = configuration.getLogger(treatWarningsAsErrors = true),
-            knownIrProviders = listOf(KLIB_INTEROP_IR_PROVIDER_IDENTIFIER)
-        ).getFullResolvedList().last().library
+        val library = loadNativeKlibsInTestPipeline(
+            configuration = configuration,
+            libraryPaths = listOf(outputArtifact.outputFile.path),
+            nativeTarget = testServices.nativeEnvironmentConfigurator.getNativeTarget(module),
+        ).all.single()
 
         val moduleDescriptor = nativeFactories.DefaultDeserializedDescriptorFactory.createDescriptorOptionalBuiltIns(
             library,