[FIR] Use KlibBasedSymbolProvider in FirCommonSessionFactory

Unify logic of KLib resolving (Common and JS) ^KT-56354 Fixed
2023-03-01 14:20:49 +01:00
parent d829f8b684
commit de5b475f7a
17 changed files with 163 additions and 74 deletions
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.common
+
+import org.jetbrains.kotlin.konan.file.File
+import org.jetbrains.kotlin.library.KotlinLibrary
+import org.jetbrains.kotlin.library.KotlinLibraryProperResolverWithAttributes
+import org.jetbrains.kotlin.library.UnresolvedLibrary
+import org.jetbrains.kotlin.library.impl.createKotlinLibraryComponents
+import org.jetbrains.kotlin.library.metadata.resolver.KotlinLibraryResolveResult
+import org.jetbrains.kotlin.library.metadata.resolver.KotlinLibraryResolver
+import org.jetbrains.kotlin.library.metadata.resolver.impl.libraryResolver
+import org.jetbrains.kotlin.util.Logger
+
+object CommonJsKLibResolver {
+    fun resolve(libraries: Collection<String>, logger: Logger): KotlinLibraryResolveResult =
+        resolveWithoutDependencies(
+            libraries,
+            logger
+        ).resolveWithDependencies()
+
+    fun resolveWithoutDependencies(
+        libraries: Collection<String>,
+        logger: Logger
+    ): KLibResolution {
+        val unresolvedLibraries = libraries.map { UnresolvedLibrary(it, null) }
+        val libraryAbsolutePaths = libraries.map { File(it).absolutePath }
+        // Configure the resolver to only work with absolute paths for now.
+        val libraryResolver = KLibResolverHelper(
+            repositories = emptyList(),
+            directLibs = libraryAbsolutePaths,
+            distributionKlib = null,
+            localKotlinDir = null,
+            skipCurrentDir = false,
+            logger = logger
+        ).libraryResolver()
+
+        return KLibResolution(
+            libraryResolver,
+            libraryResolver.resolveWithoutDependencies(
+                unresolvedLibraries = unresolvedLibraries,
+                noStdLib = true,
+                noDefaultLibs = true,
+                noEndorsedLibs = true
+            )
+        )
+    }
+}
+
+class KLibResolution(
+    private val libraryResolver: KotlinLibraryResolver<KotlinLibrary>,
+    val libraries: List<KotlinLibrary>
+) {
+    fun resolveWithDependencies(): KotlinLibraryResolveResult {
+        return with(libraryResolver) {
+            libraries.resolveDependencies()
+        }
+    }
+}
+
+private class KLibResolverHelper(
+    repositories: List<String>,
+    directLibs: List<String>,
+    distributionKlib: String?,
+    localKotlinDir: String?,
+    skipCurrentDir: Boolean,
+    logger: Logger
+) : KotlinLibraryProperResolverWithAttributes<KotlinLibrary>(
+    repositories,
+    directLibs,
+    distributionKlib,
+    localKotlinDir,
+    skipCurrentDir,
+    logger,
+    emptyList()
+) {
+    // Stick with the default KotlinLibrary for now.
+    override fun libraryComponentBuilder(file: File, isDefault: Boolean) = createKotlinLibraryComponents(file, isDefault)
+}