Commonizing klib metadata between native and js

konan/library-reader/build.gradle.kts

@@ -25,6 +25,9 @@ dependencies {
     mavenCompileScope(project(":kotlin-compiler"))
 
     compile(project(":kotlin-native:kotlin-native-utils"))
+    compile(project(":kotlin-util-io"))
+    compile(project(":kotlin-util-klib"))
+    compile(project(":kotlin-util-klib-metadata"))
 
     testCompile(commonDep("junit:junit"))
 }

konan/library-reader/src/konan.proto

@@ -1,101 +0,0 @@
-/*
- * Copyright 2010-2018 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.
- */
-
-syntax = "proto2";
-
-package org.jetbrains.kotlin.metadata.konan;
-
-import "core/metadata/src/metadata.proto";
-
-option java_outer_classname = "KonanProtoBuf";
-option optimize_for = LITE_RUNTIME;
-
-// Konan extensions to the "descriptors" protobuf.
-
-extend Package {
-    optional int32 package_fq_name = 171;
-}
-
-extend Class {
-    repeated Annotation class_annotation = 170;
-}
-
-extend Constructor {
-    repeated Annotation constructor_annotation = 170;
-    optional InlineIrBody inline_constructor_ir_body = 171;
-}
-
-extend Function {
-    repeated Annotation function_annotation = 170;
-    optional InlineIrBody inline_ir_body = 171;
-    optional int32 function_file = 172;
-}
-
-extend Property {
-    repeated Annotation property_annotation = 170;
-    repeated Annotation property_getter_annotation = 177;
-    repeated Annotation property_setter_annotation = 178;
-    optional bool has_backing_field = 171;
-    optional bool used_as_variable = 172;
-    optional Annotation.Argument.Value compile_time_value = 173;
-    optional InlineIrBody inline_getter_ir_body = 174;
-    optional InlineIrBody inline_setter_ir_body = 175;
-    optional int32 property_file = 176;
-}
-
-extend EnumEntry {
-    repeated Annotation enum_entry_annotation = 170;
-    optional int32 enum_entry_ordinal = 171;
-}
-
-extend ValueParameter {
-    repeated Annotation parameter_annotation = 170;
-}
-
-extend Type {
-    repeated Annotation type_annotation = 170;
-    optional string type_text = 172; // TODO: remove me
-}
-
-extend TypeParameter {
-    repeated Annotation type_parameter_annotation = 170;
-}
-
-message InlineIrBody {
-    // We need to refer from descriptors to ir inline body.
-    // And in ir we need to refer local declaration descriptors
-    // That requires mutual import of KonanIr and KonanLinkData.
-    // I break the circle here by storing encoded IR.
-    // May be we need to merge KonanIr into KonanLinkData.
-    // That'd allow mutually recursive messages.
-    required string encoded_ir = 11;
-}
-
-// Konan Binary Linkdata structures.
-
-message LinkDataPackageFragment {
-    // Make if an index?
-    required string fq_name = 1;
-    required Package package = 4;
-    required LinkDataClasses classes = 5;
-    required bool is_empty = 6;
-
-    // To construct name resolver
-    required QualifiedNameTable name_table = 2;
-    required StringTable string_table = 3;
-}
-
-message LinkDataClasses {
-    // Index in the QualifiedNameIndex table.
-    repeated int32 class_name = 1;
-    repeated Class classes = 2;
-}
-
-message LinkDataLibrary {
-    required string module_name = 1;
-    repeated string package_fragment_name = 2;
-    repeated string empty_package = 3;
-    repeated string file = 4;
-}

konan/library-reader/src/org/jetbrains/kotlin/descriptors/konan/KonanModuleDescriptorFactory.kt

@@ -1,37 +0,0 @@
-/*
- * Copyright 2010-2018 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.descriptors.konan
-
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.storage.StorageManager
-
-interface KonanModuleDescriptorFactory {
-
-    /**
-     * Base method for creation of any Kotlin/Native [ModuleDescriptor].
-     */
-    fun createDescriptor(
-        name: Name,
-        storageManager: StorageManager,
-        builtIns: KotlinBuiltIns,
-        origin: KonanModuleOrigin,
-        customCapabilities: Map<ModuleDescriptor.Capability<*>, Any?> = emptyMap()
-    ): ModuleDescriptorImpl
-
-    /**
-     * Please use this method with care: As far as it creates an instance of [KotlinBuiltIns] it should be
-     * normally used for creation of the very first (e.g. "stdlib") module in the set of created modules.
-     */
-    fun createDescriptorAndNewBuiltIns(
-        name: Name,
-        storageManager: StorageManager,
-        origin: KonanModuleOrigin,
-        customCapabilities: Map<ModuleDescriptor.Capability<*>, Any?> = emptyMap()
-    ): ModuleDescriptorImpl
-}

konan/library-reader/src/org/jetbrains/kotlin/descriptors/konan/KonanModuleOrigin.kt

@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2018 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.descriptors.konan
-
-import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.konan.library.KonanLibrary
-import org.jetbrains.kotlin.konan.library.isInterop
-
-sealed class KonanModuleOrigin {
-
-    companion object {
-        val CAPABILITY = ModuleDescriptor.Capability<KonanModuleOrigin>("KonanModuleOrigin")
-    }
-}
-
-sealed class CompiledKonanModuleOrigin: KonanModuleOrigin()
-
-class DeserializedKonanModuleOrigin(val library: KonanLibrary) : CompiledKonanModuleOrigin()
-
-object CurrentKonanModuleOrigin: CompiledKonanModuleOrigin()
-
-object SyntheticModulesOrigin : KonanModuleOrigin()
-
-internal fun KonanModuleOrigin.isInteropLibrary(): Boolean = when (this) {
-    is DeserializedKonanModuleOrigin -> this.library.isInterop
-    CurrentKonanModuleOrigin, SyntheticModulesOrigin -> false
-}
-
-val ModuleDescriptor.konanModuleOrigin get() = this.getCapability(KonanModuleOrigin.CAPABILITY)!!

konan/library-reader/src/org/jetbrains/kotlin/descriptors/konan/impl/KonanModuleDescriptorFactoryImpl.kt

@@ -1,51 +0,0 @@
-/*
- * Copyright 2010-2018 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.descriptors.konan.impl
-
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.builtins.konan.KonanBuiltIns
-import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
-import org.jetbrains.kotlin.descriptors.konan.KonanModuleDescriptorFactory
-import org.jetbrains.kotlin.descriptors.konan.KonanModuleOrigin
-import org.jetbrains.kotlin.descriptors.konan.isInteropLibrary
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.ImplicitIntegerCoercion
-import org.jetbrains.kotlin.storage.StorageManager
-
-internal object KonanModuleDescriptorFactoryImpl : KonanModuleDescriptorFactory {
-
-    override fun createDescriptor(
-        name: Name,
-        storageManager: StorageManager,
-        builtIns: KotlinBuiltIns,
-        origin: KonanModuleOrigin,
-        customCapabilities: Map<ModuleDescriptor.Capability<*>, Any?>
-    ) = ModuleDescriptorImpl(
-        name,
-        storageManager,
-        builtIns,
-        capabilities = customCapabilities + mapOf(
-            KonanModuleOrigin.CAPABILITY to origin,
-            ImplicitIntegerCoercion.MODULE_CAPABILITY to origin.isInteropLibrary()
-        )
-    )
-
-    override fun createDescriptorAndNewBuiltIns(
-        name: Name,
-        storageManager: StorageManager,
-        origin: KonanModuleOrigin,
-        customCapabilities: Map<ModuleDescriptor.Capability<*>, Any?>
-    ): ModuleDescriptorImpl {
-
-        val builtIns = KonanBuiltIns(storageManager)
-
-        val moduleDescriptor = createDescriptor(name, storageManager, builtIns, origin, customCapabilities)
-        builtIns.builtInsModule = moduleDescriptor
-
-        return moduleDescriptor
-    }
-}

konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanFactories.kt

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2010-2019 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.konan.library
+
+import org.jetbrains.kotlin.builtins.konan.KonanBuiltIns
+import org.jetbrains.kotlin.konan.util.KlibMetadataFactories
+import org.jetbrains.kotlin.serialization.konan.NullFlexibleTypeDeserializer
+import org.jetbrains.kotlin.storage.StorageManager
+
+fun createKonanBuiltIns(storageManager: StorageManager) = KonanBuiltIns(storageManager)
+/**
+ * The default Kotlin/Native factories.
+ */
+object KonanFactories : KlibMetadataFactories(::createKonanBuiltIns, NullFlexibleTypeDeserializer)

konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanLibrary.kt

@@ -1,73 +0,0 @@
-/*
- * Copyright 2010-2018 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.konan.library
-
-import org.jetbrains.kotlin.konan.file.File
-import org.jetbrains.kotlin.konan.properties.Properties
-import org.jetbrains.kotlin.konan.properties.propertyList
-import org.jetbrains.kotlin.metadata.konan.KonanProtoBuf
-import org.jetbrains.kotlin.name.FqName
-
-const val KLIB_PROPERTY_ABI_VERSION = "abi_version"
-const val KLIB_PROPERTY_UNIQUE_NAME = "unique_name"
-const val KLIB_PROPERTY_COMPILER_VERSION = "compiler_version"
-const val KLIB_PROPERTY_LINKED_OPTS = "linkerOpts"
-const val KLIB_PROPERTY_DEPENDS = "depends"
-const val KLIB_PROPERTY_INTEROP = "interop"
-const val KLIB_PROPERTY_PACKAGE = "package"
-const val KLIB_PROPERTY_EXPORT_FORWARD_DECLARATIONS = "exportForwardDeclarations"
-const val KLIB_PROPERTY_INCLUDED_HEADERS = "includedHeaders"
-
-/**
- * An abstraction for getting access to the information stored inside of Kotlin/Native library.
- */
-interface KonanLibrary {
-
-    val libraryName: String
-    val libraryFile: File
-
-    // Whether this library is default (provided by Kotlin/Native distribution)?
-    val isDefault: Boolean
-
-    // Properties:
-    val manifestProperties: Properties
-    val abiVersion: String
-    val linkerOpts: List<String>
-
-    // Paths:
-    val bitcodePaths: List<String>
-    val includedPaths: List<String>
-
-    val targetList: List<String>
-
-    val dataFlowGraph: ByteArray?
-    val moduleHeaderData: KonanProtoBuf.LinkDataLibrary
-    fun packageMetadataParts(fqName: String): Set<String>
-    fun packageMetadata(packageFqName: String, partName: String): KonanProtoBuf.LinkDataPackageFragment
-}
-
-val KonanLibrary.uniqueName
-    get() = manifestProperties.getProperty(KLIB_PROPERTY_UNIQUE_NAME)!!
-
-val KonanLibrary.unresolvedDependencies: List<String>
-    get() = manifestProperties.propertyList(KLIB_PROPERTY_DEPENDS)
-
-val KonanLibrary.isInterop
-    get() = manifestProperties.getProperty(KLIB_PROPERTY_INTEROP) == "true"
-
-val KonanLibrary.packageFqName
-    get() = manifestProperties.getProperty(KLIB_PROPERTY_PACKAGE)?.let { FqName(it) }
-
-val KonanLibrary.exportForwardDeclarations
-    get() = manifestProperties.getProperty(KLIB_PROPERTY_EXPORT_FORWARD_DECLARATIONS)
-        .split(' ').asSequence()
-        .map { it.trim() }
-        .filter { it.isNotEmpty() }
-        .map { FqName(it) }
-        .toList()
-
-val KonanLibrary.includedHeaders
-    get() = manifestProperties.getProperty(KLIB_PROPERTY_INCLUDED_HEADERS).split(' ')

konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanLibraryLayout.kt

@@ -1,48 +0,0 @@
-/*
- * Copyright 2010-2018 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.konan.library
-
-import org.jetbrains.kotlin.konan.file.File
-import org.jetbrains.kotlin.konan.target.KonanTarget
-
-/**
- * This scheme describes the Kotlin/Native Library (KLIB) layout.
- */
-interface KonanLibraryLayout {
-
-    val libraryName: String
-    val libDir: File
-
-    val source: KonanLibrarySource
-
-    // This is a default implementation. Can't make it an assignment.
-    val target: KonanTarget? get() = null
-
-    val manifestFile get() = File(libDir, KLIB_MANIFEST_FILE_NAME)
-    val resourcesDir get() = File(libDir, "resources")
-
-    val targetsDir get() = File(libDir, "targets")
-    val targetDir get() = File(targetsDir, target!!.visibleName)
-
-    val kotlinDir get() = File(targetDir, "kotlin")
-    val nativeDir get() = File(targetDir, "native")
-    val includedDir get() = File(targetDir, "included")
-
-    val linkdataDir get() = File(libDir, "linkdata")
-    val moduleHeaderFile get() = File(linkdataDir, KLIB_MODULE_METADATA_FILE_NAME)
-    val dataFlowGraphFile get() = File(linkdataDir, "module_data_flow_graph")
-
-    fun packageFragmentsDir(packageFqName: String) =
-        File(linkdataDir, if (packageFqName == "") "root_package" else "package_$packageFqName")
-
-    fun packageFragmentFile(packageFqName: String, partName: String) =
-        File(packageFragmentsDir(packageFqName), "$partName$KLIB_METADATA_FILE_EXTENSION_WITH_DOT")
-}
-
-sealed class KonanLibrarySource {
-    object KonanLibraryDir : KonanLibrarySource()
-    class KonanLibraryFile(val klibFile: File) : KonanLibrarySource()
-}

konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanLibraryUtils.kt

@@ -1,45 +0,0 @@
-/*
- * Copyright 2010-2018 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.konan.library
-
-import org.jetbrains.kotlin.konan.file.File
-import org.jetbrains.kotlin.konan.file.file
-import org.jetbrains.kotlin.konan.file.withMutableZipFileSystem
-import org.jetbrains.kotlin.konan.library.impl.DefaultMetadataReaderImpl
-import org.jetbrains.kotlin.konan.library.impl.KonanLibraryImpl
-import org.jetbrains.kotlin.konan.library.impl.zippedKonanLibraryChecks
-import org.jetbrains.kotlin.konan.library.resolver.KonanLibraryResolver
-import org.jetbrains.kotlin.konan.library.resolver.impl.KonanLibraryResolverImpl
-import org.jetbrains.kotlin.konan.target.KonanTarget
-
-fun File.unpackZippedKonanLibraryTo(newDir: File) {
-
-    // First, run validity checks for the given KLIB file.
-    zippedKonanLibraryChecks(this)
-
-    if (newDir.exists) {
-        if (newDir.isDirectory)
-            newDir.deleteRecursively()
-        else
-            newDir.delete()
-    }
-
-    this.withMutableZipFileSystem {
-        it.file("/").recursiveCopyTo(newDir)
-    }
-    check(newDir.exists) { "Could not unpack $this as $newDir." }
-}
-
-fun createKonanLibrary(
-    libraryFile: File,
-    currentAbiVersion: Int,
-    target: KonanTarget? = null,
-    isDefault: Boolean = false,
-    metadataReader: MetadataReader = DefaultMetadataReaderImpl
-): KonanLibrary = KonanLibraryImpl(libraryFile, currentAbiVersion, target, isDefault, metadataReader)
-
-fun SearchPathResolverWithTarget.libraryResolver(abiVersion: Int): KonanLibraryResolver =
-    KonanLibraryResolverImpl(this, abiVersion)

konan/library-reader/src/org/jetbrains/kotlin/konan/library/KonanMetadataReader.kt

@@ -1,17 +0,0 @@
-/*
- * Copyright 2010-2018 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.konan.library
-
-import org.jetbrains.kotlin.metadata.konan.KonanProtoBuf
-
-interface MetadataReader {
-    fun loadSerializedModule(libraryLayout: KonanLibraryLayout): KonanProtoBuf.LinkDataLibrary
-    fun loadSerializedPackageFragment(
-        libraryLayout: KonanLibraryLayout,
-        packageFqName: String,
-        partName: String
-    ): KonanProtoBuf.LinkDataPackageFragment
-}

konan/library-reader/src/org/jetbrains/kotlin/konan/library/SearchPathResolver.kt

@@ -1,19 +0,0 @@
-/*
- * Copyright 2010-2018 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.konan.library
-
-import org.jetbrains.kotlin.konan.file.File
-import org.jetbrains.kotlin.konan.target.KonanTarget
-
-interface SearchPathResolver {
-    val searchRoots: List<File>
-    fun resolve(givenPath: String): File
-    fun defaultLinks(noStdLib: Boolean, noDefaultLibs: Boolean): List<File>
-}
-
-interface SearchPathResolverWithTarget : SearchPathResolver {
-    val target: KonanTarget
-}

konan/library-reader/src/org/jetbrains/kotlin/konan/library/impl/DefaultMetadataReaderImpl.kt

@@ -1,27 +0,0 @@
-/*
- * Copyright 2010-2018 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.konan.library.impl
-
-import org.jetbrains.kotlin.konan.library.KonanLibraryLayout
-import org.jetbrains.kotlin.konan.library.MetadataReader
-import org.jetbrains.kotlin.metadata.konan.KonanProtoBuf
-import org.jetbrains.kotlin.serialization.konan.parseModuleHeader
-import org.jetbrains.kotlin.serialization.konan.parsePackageFragment
-
-object DefaultMetadataReaderImpl : MetadataReader {
-
-    override fun loadSerializedModule(libraryLayout: KonanLibraryLayout): KonanProtoBuf.LinkDataLibrary =
-        parseModuleHeader(libraryLayout.moduleHeaderFile.readBytes())
-
-    override fun loadSerializedPackageFragment(
-        libraryLayout: KonanLibraryLayout,
-        packageFqName: String,
-        partName: String
-    ): KonanProtoBuf.LinkDataPackageFragment =
-        parsePackageFragment(
-            libraryLayout.packageFragmentFile(packageFqName, partName).readBytes()
-        )
-}

konan/library-reader/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt

@@ -1,86 +0,0 @@
-/*
- * Copyright 2010-2018 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.konan.library.impl
-
-import org.jetbrains.kotlin.konan.file.File
-import org.jetbrains.kotlin.konan.library.*
-import org.jetbrains.kotlin.konan.properties.Properties
-import org.jetbrains.kotlin.konan.properties.loadProperties
-import org.jetbrains.kotlin.konan.properties.propertyList
-import org.jetbrains.kotlin.konan.target.KonanTarget
-import org.jetbrains.kotlin.konan.util.defaultTargetSubstitutions
-import org.jetbrains.kotlin.konan.util.substitute
-import org.jetbrains.kotlin.metadata.konan.KonanProtoBuf
-
-internal class KonanLibraryImpl(
-    override val libraryFile: File,
-    private val currentAbiVersion: Int,
-    internal val target: KonanTarget?,
-    override val isDefault: Boolean,
-    private val metadataReader: MetadataReader
-) : KonanLibrary {
-
-    // For the zipped libraries inPlace gives files from zip file system
-    // whereas realFiles extracts them to /tmp.
-    // For unzipped libraries inPlace and realFiles are the same
-    // providing files in the library directory.
-
-    private val layout = createKonanLibraryLayout(libraryFile, target)
-
-    override val libraryName: String by lazy { layout.inPlace { it.libraryName } }
-
-    override val manifestProperties: Properties by lazy {
-        val properties = layout.inPlace { it.manifestFile.loadProperties() }
-        if (target != null) substitute(properties, defaultTargetSubstitutions(target))
-        properties
-    }
-
-    override val abiVersion: String
-        get() {
-            val manifestAbiVersion = manifestProperties.getProperty(KLIB_PROPERTY_ABI_VERSION)
-            check(currentAbiVersion.toString() == manifestAbiVersion) {
-                "ABI version mismatch. Compiler expects: $currentAbiVersion, the library is $manifestAbiVersion"
-            }
-            return manifestAbiVersion
-        }
-
-    override val linkerOpts: List<String>
-        get() = manifestProperties.propertyList(KLIB_PROPERTY_LINKED_OPTS, target!!.visibleName)
-
-    override val bitcodePaths: List<String>
-        get() = layout.realFiles { (it.kotlinDir.listFilesOrEmpty + it.nativeDir.listFilesOrEmpty).map { it.absolutePath } }
-
-    override val includedPaths: List<String>
-        get() = layout.realFiles { it.includedDir.listFilesOrEmpty.map { it.absolutePath } }
-
-    override val targetList by lazy { layout.inPlace { it.targetsDir.listFiles.map { it.name } } }
-
-    override val dataFlowGraph by lazy { layout.inPlace { it.dataFlowGraphFile.let { if (it.exists) it.readBytes() else null } } }
-
-    override val moduleHeaderData: KonanProtoBuf.LinkDataLibrary by lazy { layout.inPlace { metadataReader.loadSerializedModule(it) } }
-
-    override fun packageMetadata(packageFqName: String, partName: String) =
-        layout.inPlace { metadataReader.loadSerializedPackageFragment(it, packageFqName, partName) }
-
-    override fun packageMetadataParts(fqName: String): Set<String> =
-        layout.inPlace { inPlaceLayout ->
-            val fileList =
-                inPlaceLayout.packageFragmentsDir(fqName)
-                    .listFiles
-                    .mapNotNull {
-                        it.name
-                            .substringBeforeLast(KLIB_METADATA_FILE_EXTENSION_WITH_DOT, missingDelimiterValue = "")
-                            .takeIf { it.isNotEmpty() }
-                    }
-
-            fileList.toSortedSet().also {
-                require(it.size == fileList.size) { "Duplicated names: ${fileList.groupingBy { it }.eachCount().filter { (_, count) -> count > 1 }}" }
-            }
-        }
-
-
-    override fun toString() = "$libraryName[default=$isDefault]"
-}

konan/library-reader/src/org/jetbrains/kotlin/konan/library/impl/KonanLibraryLayoutImpl.kt

@@ -1,104 +0,0 @@
-/*
- * Copyright 2010-2018 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.konan.library.impl
-
-import org.jetbrains.kotlin.konan.file.*
-import org.jetbrains.kotlin.konan.library.KLIB_FILE_EXTENSION
-import org.jetbrains.kotlin.konan.library.KLIB_FILE_EXTENSION_WITH_DOT
-import org.jetbrains.kotlin.konan.library.KonanLibraryLayout
-import org.jetbrains.kotlin.konan.library.KonanLibrarySource.KonanLibraryDir
-import org.jetbrains.kotlin.konan.library.KonanLibrarySource.KonanLibraryFile
-import org.jetbrains.kotlin.konan.target.KonanTarget
-import java.nio.file.FileSystem
-
-interface KonanLibraryLayoutImpl : KonanLibraryLayout {
-    fun <T> inPlace(action: (KonanLibraryLayout) -> T): T
-    fun <T> realFiles(action: (KonanLibraryLayout) -> T): T
-}
-
-private class ZippedKonanLibraryLayout(
-    klibFile: File,
-    override val target: KonanTarget?
-) : KonanLibraryLayoutImpl {
-
-    init {
-        zippedKonanLibraryChecks(klibFile)
-    }
-
-    override val libraryName = klibFile.path.removeSuffix(KLIB_FILE_EXTENSION_WITH_DOT)
-    override val libDir: File = File("/")
-    override val source = KonanLibraryFile(klibFile)
-
-    override fun <T> realFiles(action: (KonanLibraryLayout) -> T) = action(FileExtractor(this))
-
-    override fun <T> inPlace(action: (KonanLibraryLayout) -> T) = source.klibFile.withZipFileSystem { zipFileSystem ->
-        action(DirectFromZip(this, zipFileSystem))
-    }
-}
-
-internal fun zippedKonanLibraryChecks(klibFile: File) {
-    check(klibFile.exists) { "Could not find $klibFile." }
-    check(klibFile.isFile) { "Expected $klibFile to be a regular file." }
-
-    val extension = klibFile.extension
-    check(extension.isEmpty() || extension == KLIB_FILE_EXTENSION) { "Unexpected file extension: $extension" }
-}
-
-private class UnzippedKonanLibraryLayout(
-    override val libDir: File,
-    override val target: KonanTarget?
-) : KonanLibraryLayoutImpl {
-
-    override val libraryName = libDir.path
-    override val source = KonanLibraryDir
-
-    override fun <T> inPlace(action: (KonanLibraryLayout) -> T) = action(this)
-    override fun <T> realFiles(action: (KonanLibraryLayout) -> T) = inPlace(action)
-}
-
-private class DirectFromZip(
-    zippedLayout: ZippedKonanLibraryLayout,
-    zipFileSystem: FileSystem
-) : KonanLibraryLayout {
-
-    override val libraryName = zippedLayout.libraryName
-    override val libDir = zipFileSystem.file(zippedLayout.libDir)
-    override val source = zippedLayout.source
-}
-
-/**
- * This class automatically extracts pieces of the library on first access. Use it if you need
- * to pass extracted files to an external tool. Otherwise, stick to [DirectFromZip].
- */
-private class FileExtractor(
-    val zippedLayout: ZippedKonanLibraryLayout
-) : KonanLibraryLayout by zippedLayout {
-
-    override val manifestFile: File by lazy { extract(super.manifestFile) }
-    override val resourcesDir: File by lazy { extractDir(super.resourcesDir) }
-    override val includedDir: File by lazy { extractDir(super.includedDir) }
-    override val kotlinDir: File by lazy { extractDir(super.kotlinDir) }
-    override val nativeDir: File by lazy { extractDir(super.nativeDir) }
-    override val linkdataDir: File by lazy { extractDir(super.linkdataDir) }
-
-    fun extract(file: File): File = zippedLayout.source.klibFile.withZipFileSystem { zipFileSystem ->
-        val temporary = createTempFile(file.name)
-        zipFileSystem.file(file).copyTo(temporary)
-        temporary.deleteOnExit()
-        temporary
-    }
-
-    fun extractDir(directory: File): File = zippedLayout.source.klibFile.withZipFileSystem { zipFileSystem ->
-        val temporary = createTempDir(directory.name)
-        zipFileSystem.file(directory).recursiveCopyTo(temporary)
-        temporary.deleteOnExitRecursively()
-        temporary
-    }
-}
-
-internal fun createKonanLibraryLayout(klib: File, target: KonanTarget? = null) =
-    if (klib.isFile) ZippedKonanLibraryLayout(klib, target) else UnzippedKonanLibraryLayout(klib, target)
-

konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanLibraryFacade.kt

@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.konan.library.lite
 
 import org.jetbrains.kotlin.konan.library.*
+import org.jetbrains.kotlin.library.*
 import java.io.File
 import java.io.IOException
 import java.nio.file.Path

konan/library-reader/src/org/jetbrains/kotlin/konan/library/resolver/KonanLibraryResolver.kt

@@ -1,64 +0,0 @@
-/*
- * Copyright 2010-2018 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.konan.library.resolver
-
-import org.jetbrains.kotlin.konan.library.KonanLibrary
-import org.jetbrains.kotlin.konan.library.SearchPathResolverWithTarget
-
-typealias DuplicatedLibraryLogger = (String) -> Unit
-
-interface KonanLibraryResolver {
-
-    val searchPathResolver: SearchPathResolverWithTarget
-    val abiVersion: Int
-
-    /**
-     * Given the list of Kotlin/Native library names, ABI version and other parameters
-     * resolves libraries and evaluates dependencies between them.
-     */
-    fun resolveWithDependencies(
-        libraryNames: List<String>,
-        noStdLib: Boolean = false,
-        noDefaultLibs: Boolean = false,
-        logger: DuplicatedLibraryLogger? = null
-    ): KonanLibraryResolveResult
-}
-
-interface KonanLibraryResolveResult {
-
-    fun filterRoots(predicate: (KonanResolvedLibrary) -> Boolean): KonanLibraryResolveResult
-
-    fun getFullList(order: LibraryOrder? = null): List<KonanLibrary>
-
-    fun forEach(action: (KonanLibrary, PackageAccessedHandler) -> Unit)
-}
-
-
-typealias LibraryOrder = (Iterable<KonanResolvedLibrary>) -> List<KonanResolvedLibrary>
-
-val TopologicalLibraryOrder: LibraryOrder = { input ->
-    val sorted = mutableListOf<KonanResolvedLibrary>()
-    val visited = mutableSetOf<KonanResolvedLibrary>()
-    val tempMarks = mutableSetOf<KonanResolvedLibrary>()
-
-    fun visit(node: KonanResolvedLibrary, result: MutableList<KonanResolvedLibrary>) {
-        if (visited.contains(node)) return
-        if (tempMarks.contains(node)) error("Cyclic dependency in library graph.")
-        tempMarks.add(node)
-        node.resolvedDependencies.forEach {
-            visit(it, result)
-        }
-        visited.add(node)
-        result += node
-    }
-
-    input.forEach next@{
-        if (visited.contains(it)) return@next
-        visit(it, sorted)
-    }
-
-    sorted
-}

konan/library-reader/src/org/jetbrains/kotlin/konan/library/resolver/KonanResolvedLibrary.kt

@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2018 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.konan.library.resolver
-
-import org.jetbrains.kotlin.konan.library.KonanLibrary
-import org.jetbrains.kotlin.name.FqName
-
-interface PackageAccessedHandler {
-
-    fun markPackageAccessed(fqName: FqName)
-}
-
-/**
- * A [KonanLibrary] wrapper that is used for resolving library's dependencies.
- */
-interface KonanResolvedLibrary: PackageAccessedHandler {
-
-    // The library itself.
-    val library: KonanLibrary
-
-    // Dependencies on other libraries.
-    val resolvedDependencies: List<KonanResolvedLibrary>
-
-    // Whether it is needed to linker.
-    val isNeededForLink: Boolean
-
-    // Is provided by the distribution?
-    val isDefault: Boolean
-}

konan/library-reader/src/org/jetbrains/kotlin/konan/library/resolver/impl/KonanLibraryResolverImpl.kt

@@ -1,142 +0,0 @@
-/*
- * Copyright 2010-2018 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.konan.library.resolver.impl
-
-import org.jetbrains.kotlin.konan.file.File
-import org.jetbrains.kotlin.konan.library.KonanLibrary
-import org.jetbrains.kotlin.konan.library.SearchPathResolverWithTarget
-import org.jetbrains.kotlin.konan.library.createKonanLibrary
-import org.jetbrains.kotlin.konan.library.resolver.*
-import org.jetbrains.kotlin.konan.library.unresolvedDependencies
-
-internal class KonanLibraryResolverImpl(
-    override val searchPathResolver: SearchPathResolverWithTarget,
-    override val abiVersion: Int
-) : KonanLibraryResolver {
-
-    override fun resolveWithDependencies(
-        libraryNames: List<String>,
-        noStdLib: Boolean,
-        noDefaultLibs: Boolean,
-        logger: DuplicatedLibraryLogger?
-    ) = findLibraries(libraryNames, noStdLib, noDefaultLibs)
-        .leaveDistinct(logger)
-        .resolveDependencies()
-
-    /**
-     * Returns the list of libraries based on [libraryNames], [noStdLib] and [noDefaultLibs] criteria.
-     *
-     * This method does not return any libraries that might be available via transitive dependencies
-     * from the original library set (root set).
-     */
-    private fun findLibraries(
-        libraryNames: List<String>,
-        noStdLib: Boolean,
-        noDefaultLibs: Boolean
-    ): List<KonanLibrary> {
-
-        val userProvidedLibraries = libraryNames.asSequence()
-            .map { searchPathResolver.resolve(it) }
-            .map { createKonanLibrary(it, abiVersion, searchPathResolver.target) }
-            .toList()
-
-        val defaultLibraries = searchPathResolver.defaultLinks(noStdLib, noDefaultLibs).map {
-            createKonanLibrary(it, abiVersion, searchPathResolver.target, isDefault = true)
-        }
-
-        // Make sure the user provided ones appear first, so that
-        // they have precedence over defaults when duplicates are eliminated.
-        return userProvidedLibraries + defaultLibraries
-    }
-
-    /**
-     * Leaves only distinct libraries (by absolute path), warns on duplicated paths.
-     */
-    private fun List<KonanLibrary>.leaveDistinct(logger: DuplicatedLibraryLogger?) =
-        this.groupBy { it.libraryFile.absolutePath }.let { groupedByAbsolutePath ->
-            warnOnLibraryDuplicates(groupedByAbsolutePath.filter { it.value.size > 1 }.keys, logger)
-            groupedByAbsolutePath.map { it.value.first() }
-        }
-
-    private fun warnOnLibraryDuplicates(duplicatedPaths: Iterable<String>, logger: DuplicatedLibraryLogger?) {
-        if (logger == null) return
-        duplicatedPaths.forEach { logger("library included more than once: $it") }
-    }
-
-
-    /**
-     * Given the list of root libraries does the following:
-     *
-     * 1. Evaluates other libraries that are available via transitive dependencies.
-     * 2. Wraps each [KonanLibrary] into a [KonanResolvedLibrary] with information about dependencies on other libraries.
-     * 3. Creates resulting [KonanLibraryResolveResult] object.
-     */
-    private fun List<KonanLibrary>.resolveDependencies(): KonanLibraryResolveResult {
-
-        val rootLibraries = this.map { KonanResolvedLibraryImpl(it) }
-
-        // As far as the list of root libraries is known from the very beginning, the result can be
-        // constructed from the very beginning as well.
-        val result = KonanLibraryResolverResultImpl(rootLibraries)
-
-        val cache = mutableMapOf<File, KonanResolvedLibrary>()
-        cache.putAll(rootLibraries.map { it.library.libraryFile.absoluteFile to it })
-
-        var newDependencies = rootLibraries
-        do {
-            newDependencies = newDependencies.map { library: KonanResolvedLibraryImpl ->
-                library.library.unresolvedDependencies.asSequence()
-                    .map { searchPathResolver.resolve(it).absoluteFile }
-                    .mapNotNull {
-                        if (it in cache) {
-                            library.addDependency(cache[it]!!)
-                            null
-                        } else {
-                            val newLibrary = KonanResolvedLibraryImpl(createKonanLibrary(it, abiVersion, searchPathResolver.target))
-                            cache[it] = newLibrary
-                            library.addDependency(newLibrary)
-                            newLibrary
-                        }
-                    }
-                    .toList()
-            }.flatten()
-        } while (newDependencies.isNotEmpty())
-
-        return result
-    }
-}
-
-internal class KonanLibraryResolverResultImpl(
-    private val roots: List<KonanResolvedLibrary>
-) : KonanLibraryResolveResult {
-
-    private val all: List<KonanResolvedLibrary> by lazy {
-        val result = mutableSetOf<KonanResolvedLibrary>().also { it.addAll(roots) }
-
-        var newDependencies = result.toList()
-        do {
-            newDependencies = newDependencies
-                .map { it -> it.resolvedDependencies }.flatten()
-                .filter { it !in result }
-            result.addAll(newDependencies)
-        } while (newDependencies.isNotEmpty())
-
-        result.toList()
-    }
-
-    override fun filterRoots(predicate: (KonanResolvedLibrary) -> Boolean) =
-        KonanLibraryResolverResultImpl(roots.filter(predicate))
-
-    override fun getFullList(order: LibraryOrder?) = (order?.invoke(all) ?: all).asPlain()
-
-    override fun forEach(action: (KonanLibrary, PackageAccessedHandler) -> Unit) {
-        all.forEach { action(it.library, it) }
-    }
-
-    private fun List<KonanResolvedLibrary>.asPlain() = map { it.library }
-
-    override fun toString() = "roots=$roots, all=$all"
-}

konan/library-reader/src/org/jetbrains/kotlin/konan/library/resolver/impl/KonanResolvedLibraryImpl.kt

@@ -1,39 +0,0 @@
-/*
- * Copyright 2010-2018 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.konan.library.resolver.impl
-
-import org.jetbrains.kotlin.konan.library.KonanLibrary
-import org.jetbrains.kotlin.konan.library.resolver.KonanResolvedLibrary
-import org.jetbrains.kotlin.name.FqName
-
-internal class KonanResolvedLibraryImpl(
-    override val library: KonanLibrary
-) : KonanResolvedLibrary {
-
-    private val _resolvedDependencies = mutableListOf<KonanResolvedLibrary>()
-    private val _emptyPackages by lazy { library.moduleHeaderData.emptyPackageList }
-
-    override val resolvedDependencies: List<KonanResolvedLibrary>
-        get() = _resolvedDependencies
-
-    internal fun addDependency(resolvedLibrary: KonanResolvedLibrary) = _resolvedDependencies.add(resolvedLibrary)
-
-    override var isNeededForLink: Boolean = false
-        private set
-
-    override val isDefault: Boolean
-        get() = library.isDefault
-
-    override fun markPackageAccessed(fqName: FqName) {
-        if (!isNeededForLink // fast path
-            && !_emptyPackages.contains(fqName.asString())
-        ) {
-            isNeededForLink = true
-        }
-    }
-
-    override fun toString() = "library=$library, dependsOn=${_resolvedDependencies.joinToString { it.library.toString() }}"
-}

konan/library-reader/src/org/jetbrains/kotlin/konan/util/KonanFactories.kt

@@ -1,56 +0,0 @@
-/*
- * Copyright 2010-2018 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.konan.util
-
-import org.jetbrains.kotlin.descriptors.konan.KonanModuleDescriptorFactory
-import org.jetbrains.kotlin.descriptors.konan.impl.KonanModuleDescriptorFactoryImpl
-import org.jetbrains.kotlin.serialization.konan.KonanDeserializedModuleDescriptorFactory
-import org.jetbrains.kotlin.serialization.konan.KonanDeserializedPackageFragmentsFactory
-import org.jetbrains.kotlin.serialization.konan.KonanResolvedModuleDescriptorsFactory
-import org.jetbrains.kotlin.serialization.konan.impl.KonanDeserializedModuleDescriptorFactoryImpl
-import org.jetbrains.kotlin.serialization.konan.impl.KonanDeserializedPackageFragmentsFactoryImpl
-import org.jetbrains.kotlin.serialization.konan.impl.KonanResolvedModuleDescriptorsFactoryImpl
-
-/**
- * The default Kotlin/Native factories.
- */
-object KonanFactories {
-
-    /**
-     * The default [KonanModuleDescriptorFactory] factory instance.
-     */
-    val DefaultDescriptorFactory: KonanModuleDescriptorFactory = KonanModuleDescriptorFactoryImpl
-
-    /**
-     * The default [KonanDeserializedPackageFragmentsFactory] factory instance.
-     */
-    val DefaultPackageFragmentsFactory: KonanDeserializedPackageFragmentsFactory =
-        KonanDeserializedPackageFragmentsFactoryImpl
-
-    /**
-     * The default [KonanDeserializedModuleDescriptorFactory] factory instance.
-     */
-    val DefaultDeserializedDescriptorFactory: KonanDeserializedModuleDescriptorFactory =
-        createDefaultKonanDeserializedModuleDescriptorFactory(
-            DefaultDescriptorFactory, DefaultPackageFragmentsFactory
-        )
-
-    /**
-     * The default [KonanResolvedModuleDescriptorsFactory] factory instance.
-     */
-    val DefaultResolvedDescriptorsFactory: KonanResolvedModuleDescriptorsFactory =
-        createDefaultKonanResolvedModuleDescriptorsFactory(DefaultDeserializedDescriptorFactory)
-
-    fun createDefaultKonanDeserializedModuleDescriptorFactory(
-        descriptorFactory: KonanModuleDescriptorFactory,
-        packageFragmentsFactory: KonanDeserializedPackageFragmentsFactory
-    ): KonanDeserializedModuleDescriptorFactory =
-        KonanDeserializedModuleDescriptorFactoryImpl(descriptorFactory, packageFragmentsFactory)
-
-    fun createDefaultKonanResolvedModuleDescriptorsFactory(
-        moduleDescriptorFactory: KonanDeserializedModuleDescriptorFactory
-    ): KonanResolvedModuleDescriptorsFactory = KonanResolvedModuleDescriptorsFactoryImpl(moduleDescriptorFactory)
-}

konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanClassDataFinder.kt

@@ -1,35 +0,0 @@
-/*
- * Copyright 2010-2018 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.serialization.konan
-
-import org.jetbrains.kotlin.descriptors.SourceElement
-import org.jetbrains.kotlin.metadata.deserialization.NameResolver
-import org.jetbrains.kotlin.metadata.konan.KonanProtoBuf
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.serialization.deserialization.ClassData
-import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
-import org.jetbrains.kotlin.serialization.deserialization.getClassId
-
-class KonanClassDataFinder(
-    private val fragment: KonanProtoBuf.LinkDataPackageFragment,
-    private val nameResolver: NameResolver
-) : ClassDataFinder {
-
-    override fun findClassData(classId: ClassId): ClassData? {
-        val proto = fragment.classes
-        val nameList = proto.classNameList
-
-        val index = nameList.indexOfFirst { nameResolver.getClassId(it) == classId }
-        if (index == -1) {
-            return null
-        }
-
-        val foundClass = proto.getClasses(index) ?: error("Could not find data for serialized class $classId")
-
-        /* TODO: binary version supposed to be read from protobuf. */
-        return ClassData(nameResolver, foundClass, KonanMetadataVersion.INSTANCE, SourceElement.NO_SOURCE)
-    }
-}

konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializationUtils.kt

@@ -1,14 +0,0 @@
-/*
- * Copyright 2010-2018 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.serialization.konan
-
-import org.jetbrains.kotlin.metadata.konan.KonanProtoBuf
-
-fun parsePackageFragment(packageMetadata: ByteArray): KonanProtoBuf.LinkDataPackageFragment =
-    KonanProtoBuf.LinkDataPackageFragment.parseFrom(packageMetadata, KonanSerializerProtocol.extensionRegistry)
-
-fun parseModuleHeader(libraryMetadata: ByteArray): KonanProtoBuf.LinkDataLibrary =
-    KonanProtoBuf.LinkDataLibrary.parseFrom(libraryMetadata, KonanSerializerProtocol.extensionRegistry)

konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializedModuleDescriptorFactory.kt

@@ -1,43 +0,0 @@
-/*
- * Copyright 2010-2018 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.serialization.konan
-
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.config.LanguageVersionSettings
-import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
-import org.jetbrains.kotlin.descriptors.konan.KonanModuleDescriptorFactory
-import org.jetbrains.kotlin.konan.library.KonanLibrary
-import org.jetbrains.kotlin.konan.library.resolver.PackageAccessedHandler
-import org.jetbrains.kotlin.storage.LockBasedStorageManager
-import org.jetbrains.kotlin.storage.StorageManager
-
-interface KonanDeserializedModuleDescriptorFactory {
-
-    val descriptorFactory: KonanModuleDescriptorFactory
-    val packageFragmentsFactory: KonanDeserializedPackageFragmentsFactory
-
-    fun createDescriptor(
-        library: KonanLibrary,
-        languageVersionSettings: LanguageVersionSettings,
-        storageManager: StorageManager,
-        builtIns: KotlinBuiltIns,
-        packageAccessedHandler: PackageAccessedHandler? = null,
-        customCapabilities: Map<ModuleDescriptor.Capability<*>, Any?> = emptyMap()
-    ): ModuleDescriptorImpl
-
-    /**
-     * Please use this method with care: As far as it creates an instance of [KotlinBuiltIns] it should be
-     * normally used for creation of the very first (e.g. "stdlib") module in the set of created modules.
-     */
-    fun createDescriptorAndNewBuiltIns(
-        library: KonanLibrary,
-        languageVersionSettings: LanguageVersionSettings,
-        storageManager: StorageManager,
-        packageAccessedHandler: PackageAccessedHandler? = null,
-        customCapabilities: Map<ModuleDescriptor.Capability<*>, Any?> = emptyMap()
-    ): ModuleDescriptorImpl
-}

konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanDeserializedPackageFragmentsFactory.kt

@@ -1,44 +0,0 @@
-/*
- * Copyright 2010-2018 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.serialization.konan
-
-import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
-import org.jetbrains.kotlin.konan.library.KonanLibrary
-import org.jetbrains.kotlin.konan.library.resolver.PackageAccessedHandler
-import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
-import org.jetbrains.kotlin.storage.StorageManager
-
-interface KonanDeserializedPackageFragmentsFactory {
-
-    fun createDeserializedPackageFragments(
-        library: KonanLibrary,
-        packageFragmentNames: List<String>,
-        moduleDescriptor: ModuleDescriptor,
-        packageAccessedHandler: PackageAccessedHandler?,
-        storageManager: StorageManager
-    ): List<KonanPackageFragment>
-
-    fun createSyntheticPackageFragments(
-        library: KonanLibrary,
-        deserializedPackageFragments: List<KonanPackageFragment>,
-        moduleDescriptor: ModuleDescriptor
-    ): List<PackageFragmentDescriptor>
-
-    fun createPackageFragmentProvider(
-        library: KonanLibrary,
-        packageAccessedHandler: PackageAccessedHandler?,
-        packageFragmentNames: List<String>,
-        storageManager: StorageManager,
-        moduleDescriptor: ModuleDescriptor,
-        configuration: DeserializationConfiguration
-    ): PackageFragmentProvider
-
-    fun createForwardDeclarationHackPackagePartProvider(
-        storageManager: StorageManager,
-        module: ModuleDescriptorImpl
-    ): PackageFragmentProviderImpl
-}

konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanMetadataVersion.kt

@@ -1,21 +0,0 @@
-/*
- * Copyright 2010-2018 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.serialization.konan
-
-import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
-
-class KonanMetadataVersion(vararg numbers: Int) : BinaryVersion(*numbers) {
-
-    override fun isCompatible(): Boolean = this.major == 1 && this.minor == 0
-
-    companion object {
-        @JvmField
-        val INSTANCE = KonanMetadataVersion(1, 0, 0)
-
-        @JvmField
-        val INVALID_VERSION = KonanMetadataVersion()
-    }
-}

konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanPackageFragment.kt

@@ -1,87 +0,0 @@
-/*
- * Copyright 2010-2018 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.serialization.konan
-
-import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.konan.library.KonanLibrary
-import org.jetbrains.kotlin.konan.library.resolver.PackageAccessedHandler
-import org.jetbrains.kotlin.metadata.deserialization.NameResolverImpl
-import org.jetbrains.kotlin.metadata.konan.KonanProtoBuf
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
-import org.jetbrains.kotlin.serialization.deserialization.DeserializedPackageFragment
-import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
-import org.jetbrains.kotlin.serialization.deserialization.getClassId
-import org.jetbrains.kotlin.serialization.deserialization.getName
-import org.jetbrains.kotlin.storage.StorageManager
-
-class KonanPackageFragment(
-    fqName: FqName,
-    private val library: KonanLibrary,
-    private val packageAccessedHandler: PackageAccessedHandler?,
-    storageManager: StorageManager,
-    module: ModuleDescriptor,
-    partName: String
-) : DeserializedPackageFragment(fqName, storageManager, module) {
-
-    lateinit var components: DeserializationComponents
-
-    override fun initialize(components: DeserializationComponents) {
-        this.components = components
-    }
-
-    // The proto field is lazy so that we can load only needed
-    // packages from the library.
-    private val protoForNames: KonanProtoBuf.LinkDataPackageFragment by lazy { library.packageMetadata(fqName.asString(), partName) }
-
-    val proto: KonanProtoBuf.LinkDataPackageFragment
-        get() = protoForNames.also { packageAccessedHandler?.markPackageAccessed(fqName) }
-
-    private val nameResolver by lazy {
-        NameResolverImpl(protoForNames.stringTable, protoForNames.nameTable)
-    }
-
-    override val classDataFinder by lazy {
-        KonanClassDataFinder(proto, nameResolver)
-    }
-
-    private val _memberScope by lazy {
-        /* TODO: we fake proto binary versioning for now. */
-        DeserializedPackageMemberScope(
-            this,
-            proto.getPackage(),
-            nameResolver,
-            KonanMetadataVersion.INSTANCE,
-            /* containerSource = */ null,
-            components
-        ) { loadClassNames() }
-    }
-
-    override fun getMemberScope(): DeserializedPackageMemberScope = _memberScope
-
-    private val classifierNames: Set<Name> by lazy {
-        val result = mutableSetOf<Name>()
-        result.addAll(loadClassNames())
-        protoForNames.getPackage().typeAliasList.mapTo(result) { nameResolver.getName(it.name) }
-        result
-    }
-
-    fun hasTopLevelClassifier(name: Name): Boolean = name in classifierNames
-
-    private fun loadClassNames(): Collection<Name> {
-
-        val classNameList = protoForNames.classes.classNameList
-
-        val names = classNameList.mapNotNull {
-            val classId = nameResolver.getClassId(it)
-            val shortName = classId.shortClassName
-            if (!classId.isNestedClass) shortName else null
-        }
-
-        return names
-    }
-}

konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanResolvedModuleDescriptorsFactory.kt

@@ -1,56 +0,0 @@
-/*
- * Copyright 2010-2018 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.serialization.konan
-
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.config.LanguageVersionSettings
-import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
-import org.jetbrains.kotlin.konan.library.KonanLibrary
-import org.jetbrains.kotlin.konan.library.resolver.KonanLibraryResolveResult
-import org.jetbrains.kotlin.storage.StorageManager
-
-interface KonanResolvedModuleDescriptorsFactory {
-
-    val moduleDescriptorFactory: KonanDeserializedModuleDescriptorFactory
-
-    /**
-     * Given the [resolvedLibraries] creates the list of [ModuleDescriptorImpl]s with properly installed
-     * inter-dependencies. The result of this method is returned in a form of [KonanResolvedModuleDescriptors] instance.
-     *
-     * Please use this method with care: Unless this method accepts `null` for [builtIns], it is not recommended to
-     * invoke it this way. If you are compiling a source module, please supply the non-null [builtIns] from the
-     * source module, so that all modules created in your compilation session will share the same built-ins instance.
-     *
-     * Otherwise (if `null` was supplied), a new instance of [KotlinBuiltIns] will be created. The created built-ins
-     * instance will be shared by all modules created in this method. But this instance will have no connection
-     * with probably existing built-ins instance of your source module(s).
-     */
-    fun createResolved(
-        resolvedLibraries: KonanLibraryResolveResult,
-        storageManager: StorageManager,
-        builtIns: KotlinBuiltIns?,
-        languageVersionSettings: LanguageVersionSettings,
-        customAction: ((KonanLibrary, ModuleDescriptorImpl) -> Unit)? = null,
-        customCapabilitiesGenerator: ((KonanLibrary) -> Map<ModuleDescriptor.Capability<*>, Any?>)? = null
-    ): KonanResolvedModuleDescriptors
-}
-
-class KonanResolvedModuleDescriptors(
-
-    /**
-     * The list of modules each representing an individual Kotlin/Native library. All modules
-     * in this list have properly installed dependencies, i.e. module has all necessary dependencies
-     * on other modules plus a dependency on the [forwardDeclarationsModule].
-     */
-    val resolvedDescriptors: List<ModuleDescriptorImpl>,
-
-    /**
-     * This is a module which "contains" forward declarations.
-     * Note: this module should be unique per compilation and should always be the last dependency of any module.
-     */
-    val forwardDeclarationsModule: ModuleDescriptorImpl
-)

konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/KonanSerializerProtocol.kt

@@ -1,26 +0,0 @@
-/*
- * Copyright 2010-2018 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.serialization.konan
-
-import org.jetbrains.kotlin.metadata.konan.KonanProtoBuf
-import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite
-import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
-
-object KonanSerializerProtocol : SerializerExtensionProtocol(
-    ExtensionRegistryLite.newInstance().apply(KonanProtoBuf::registerAllExtensions),
-    KonanProtoBuf.packageFqName,
-    KonanProtoBuf.constructorAnnotation,
-    KonanProtoBuf.classAnnotation,
-    KonanProtoBuf.functionAnnotation,
-    KonanProtoBuf.propertyAnnotation,
-    KonanProtoBuf.propertyGetterAnnotation,
-    KonanProtoBuf.propertySetterAnnotation,
-    KonanProtoBuf.enumEntryAnnotation,
-    KonanProtoBuf.compileTimeValue,
-    KonanProtoBuf.parameterAnnotation,
-    KonanProtoBuf.typeAnnotation,
-    KonanProtoBuf.typeParameterAnnotation
-)

konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/NullFlexibleTypeDeserializer.kt

@@ -1,20 +0,0 @@
-/*
- * Copyright 2010-2018 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.serialization.konan
-
-import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeDeserializer
-import org.jetbrains.kotlin.types.SimpleType
-
-object NullFlexibleTypeDeserializer : FlexibleTypeDeserializer {
-
-    override fun create(
-        proto: ProtoBuf.Type,
-        flexibleId: String,
-        lowerBound: SimpleType,
-        upperBound: SimpleType
-    ) = error("Illegal use of flexible type deserializer.")
-}

konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/impl/KonanDeserializedModuleDescriptorFactoryImpl.kt

@@ -1,85 +0,0 @@
-/*
- * Copyright 2010-2018 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.serialization.konan.impl
-
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.config.LanguageVersionSettings
-import org.jetbrains.kotlin.descriptors.ModuleDescriptor
-import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
-import org.jetbrains.kotlin.descriptors.konan.DeserializedKonanModuleOrigin
-import org.jetbrains.kotlin.descriptors.konan.KonanModuleDescriptorFactory
-import org.jetbrains.kotlin.konan.library.KonanLibrary
-import org.jetbrains.kotlin.konan.library.resolver.PackageAccessedHandler
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.CompilerDeserializationConfiguration
-import org.jetbrains.kotlin.serialization.konan.KonanDeserializedModuleDescriptorFactory
-import org.jetbrains.kotlin.serialization.konan.KonanDeserializedPackageFragmentsFactory
-import org.jetbrains.kotlin.storage.StorageManager
-
-internal class KonanDeserializedModuleDescriptorFactoryImpl(
-    override val descriptorFactory: KonanModuleDescriptorFactory,
-    override val packageFragmentsFactory: KonanDeserializedPackageFragmentsFactory
-) : KonanDeserializedModuleDescriptorFactory {
-
-    override fun createDescriptor(
-        library: KonanLibrary,
-        languageVersionSettings: LanguageVersionSettings,
-        storageManager: StorageManager,
-        builtIns: KotlinBuiltIns,
-        packageAccessedHandler: PackageAccessedHandler?,
-        customCapabilities: Map<ModuleDescriptor.Capability<*>, Any?>
-    ) = createDescriptorOptionalBuiltIns(
-        library,
-        languageVersionSettings,
-        storageManager,
-        builtIns,
-        packageAccessedHandler,
-        customCapabilities
-    )
-
-    override fun createDescriptorAndNewBuiltIns(
-        library: KonanLibrary,
-        languageVersionSettings: LanguageVersionSettings,
-        storageManager: StorageManager,
-        packageAccessedHandler: PackageAccessedHandler?,
-        customCapabilities: Map<ModuleDescriptor.Capability<*>, Any?>
-    ) = createDescriptorOptionalBuiltIns(library, languageVersionSettings, storageManager, null, packageAccessedHandler, customCapabilities)
-
-    private fun createDescriptorOptionalBuiltIns(
-        library: KonanLibrary,
-        languageVersionSettings: LanguageVersionSettings,
-        storageManager: StorageManager,
-        builtIns: KotlinBuiltIns?,
-        packageAccessedHandler: PackageAccessedHandler?,
-        customCapabilities: Map<ModuleDescriptor.Capability<*>, Any?>
-    ): ModuleDescriptorImpl {
-
-        val libraryProto = library.moduleHeaderData
-
-        val moduleName = Name.special(libraryProto.moduleName)
-        val moduleOrigin = DeserializedKonanModuleOrigin(library)
-
-        val moduleDescriptor = if (builtIns != null)
-            descriptorFactory.createDescriptor(moduleName, storageManager, builtIns, moduleOrigin, customCapabilities)
-        else
-            descriptorFactory.createDescriptorAndNewBuiltIns(moduleName, storageManager, moduleOrigin, customCapabilities)
-
-        val deserializationConfiguration = CompilerDeserializationConfiguration(languageVersionSettings)
-
-        val provider = packageFragmentsFactory.createPackageFragmentProvider(
-            library,
-            packageAccessedHandler,
-            libraryProto.packageFragmentNameList,
-            storageManager,
-            moduleDescriptor,
-            deserializationConfiguration
-        )
-
-        moduleDescriptor.initialize(provider)
-
-        return moduleDescriptor
-    }
-}

konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/impl/KonanDeserializedPackageFragmentsFactoryImpl.kt

@@ -1,281 +0,0 @@
-/*
- * Copyright 2010-2018 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.serialization.konan.impl
-
-import org.jetbrains.kotlin.builtins.functions.functionInterfacePackageFragmentProvider
-import org.jetbrains.kotlin.contracts.ContractDeserializerImpl
-import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl
-import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider
-import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
-import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl
-import org.jetbrains.kotlin.incremental.components.LookupLocation
-import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.incremental.components.NoLookupLocation
-import org.jetbrains.kotlin.konan.library.*
-import org.jetbrains.kotlin.konan.library.resolver.PackageAccessedHandler
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
-import org.jetbrains.kotlin.resolve.scopes.MemberScope
-import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl
-import org.jetbrains.kotlin.serialization.deserialization.*
-import org.jetbrains.kotlin.serialization.konan.KonanDeserializedPackageFragmentsFactory
-import org.jetbrains.kotlin.serialization.konan.KonanPackageFragment
-import org.jetbrains.kotlin.serialization.konan.KonanSerializerProtocol
-import org.jetbrains.kotlin.serialization.konan.NullFlexibleTypeDeserializer
-import org.jetbrains.kotlin.storage.LockBasedStorageManager
-import org.jetbrains.kotlin.storage.StorageManager
-import org.jetbrains.kotlin.storage.getValue
-import org.jetbrains.kotlin.utils.Printer
-import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
-
-// FIXME(ddol): decouple and move interop-specific logic back to Kotlin/Native.
-internal object KonanDeserializedPackageFragmentsFactoryImpl : KonanDeserializedPackageFragmentsFactory {
-
-    override fun createDeserializedPackageFragments(
-        library: KonanLibrary,
-        packageFragmentNames: List<String>,
-        moduleDescriptor: ModuleDescriptor,
-        packageAccessedHandler: PackageAccessedHandler?,
-        storageManager: StorageManager
-    ) = packageFragmentNames.flatMap {
-        val fqName = FqName(it)
-        val parts = library.packageMetadataParts(it)
-        parts.map { partName ->
-            KonanPackageFragment(fqName, library, packageAccessedHandler, storageManager, moduleDescriptor, partName)
-        }
-    }
-
-    override fun createSyntheticPackageFragments(
-        library: KonanLibrary,
-        deserializedPackageFragments: List<KonanPackageFragment>,
-        moduleDescriptor: ModuleDescriptor
-    ): List<PackageFragmentDescriptor> {
-
-        if (!library.isInterop) return emptyList()
-
-        val mainPackageFqName = library.packageFqName
-            ?: error("Inconsistent manifest: interop library ${library.libraryName} should have `package` specified")
-        val exportForwardDeclarations = library.exportForwardDeclarations
-
-        val aliasedPackageFragments = deserializedPackageFragments.filter { it.fqName == mainPackageFqName }
-
-        val result = mutableListOf<PackageFragmentDescriptor>()
-        listOf(
-            ForwardDeclarationsFqNames.cNamesStructs,
-            ForwardDeclarationsFqNames.objCNamesClasses,
-            ForwardDeclarationsFqNames.objCNamesProtocols
-        ).mapTo(result) { fqName ->
-            ClassifierAliasingPackageFragmentDescriptor(aliasedPackageFragments, moduleDescriptor, fqName)
-        }
-
-        result.add(ExportedForwardDeclarationsPackageFragmentDescriptor(moduleDescriptor, mainPackageFqName, exportForwardDeclarations))
-
-        return result
-    }
-
-    override fun createPackageFragmentProvider(
-        library: KonanLibrary,
-        packageAccessedHandler: PackageAccessedHandler?,
-        packageFragmentNames: List<String>,
-        storageManager: StorageManager,
-        moduleDescriptor: ModuleDescriptor,
-        configuration: DeserializationConfiguration
-    ): PackageFragmentProvider {
-
-        val deserializedPackageFragments = createDeserializedPackageFragments(
-            library, packageFragmentNames, moduleDescriptor, packageAccessedHandler, storageManager
-        )
-
-        val syntheticPackageFragments = createSyntheticPackageFragments(
-            library, deserializedPackageFragments, moduleDescriptor
-        )
-
-        val packageFragmentProvider = PackageFragmentProviderImpl(deserializedPackageFragments + syntheticPackageFragments)
-
-        val notFoundClasses = NotFoundClasses(storageManager, moduleDescriptor)
-
-        val annotationAndConstantLoader = AnnotationAndConstantLoaderImpl(
-            moduleDescriptor,
-            notFoundClasses,
-            KonanSerializerProtocol
-        )
-
-        val components = DeserializationComponents(
-            storageManager,
-            moduleDescriptor,
-            configuration,
-            DeserializedClassDataFinder(packageFragmentProvider),
-            annotationAndConstantLoader,
-            packageFragmentProvider,
-            LocalClassifierTypeSettings.Default,
-            ErrorReporter.DO_NOTHING,
-            LookupTracker.DO_NOTHING,
-            NullFlexibleTypeDeserializer,
-            emptyList(),
-            notFoundClasses,
-            ContractDeserializerImpl(configuration, storageManager),
-            extensionRegistryLite = KonanSerializerProtocol.extensionRegistry
-        )
-
-        for (packageFragment in deserializedPackageFragments) {
-            packageFragment.initialize(components)
-        }
-
-        return if (library.uniqueName == KONAN_STDLIB_NAME)
-            CompositePackageFragmentProvider(
-                listOf(
-                    packageFragmentProvider,
-                    functionInterfacePackageFragmentProvider(storageManager, moduleDescriptor)
-                )
-            )
-        else
-            packageFragmentProvider
-    }
-
-    override fun createForwardDeclarationHackPackagePartProvider(
-        storageManager: StorageManager,
-        module: ModuleDescriptorImpl
-    ): PackageFragmentProviderImpl {
-        fun createPackage(fqName: FqName, supertypeName: String, classKind: ClassKind) =
-            ForwardDeclarationsPackageFragmentDescriptor(
-                storageManager,
-                module,
-                fqName,
-                Name.identifier(supertypeName),
-                classKind
-            )
-
-        val packageFragmentProvider = PackageFragmentProviderImpl(
-            listOf(
-                createPackage(ForwardDeclarationsFqNames.cNamesStructs, "COpaque", ClassKind.CLASS),
-                createPackage(ForwardDeclarationsFqNames.objCNamesClasses, "ObjCObjectBase", ClassKind.CLASS),
-                createPackage(ForwardDeclarationsFqNames.objCNamesProtocols, "ObjCObject", ClassKind.INTERFACE)
-            )
-        )
-        return packageFragmentProvider
-    }
-}
-
-/**
- * The package fragment to export forward declarations from interop package namespace, i.e.
- * redirect "$pkg.$name" to e.g. "cnames.structs.$name".
- */
-class ExportedForwardDeclarationsPackageFragmentDescriptor(
-    module: ModuleDescriptor,
-    fqName: FqName,
-    declarations: List<FqName>
-) : PackageFragmentDescriptorImpl(module, fqName) {
-
-    private val memberScope = object : MemberScopeImpl() {
-
-        private val nameToFqName = declarations.map { it.shortName() to it }.toMap()
-
-        override fun getContributedClassifier(name: Name, location: LookupLocation): ClassifierDescriptor? {
-            val declFqName = nameToFqName[name] ?: return null
-
-            val packageView = module.getPackage(declFqName.parent())
-            return packageView.memberScope.getContributedClassifier(name, location) // ?: FIXME(ddol): delegate to forward declarations synthetic module!
-        }
-
-        override fun printScopeStructure(p: Printer) {
-            p.println(this::class.java.simpleName, " {")
-            p.pushIndent()
-
-            p.println("declarations = $declarations")
-
-            p.popIndent()
-            p.println("}")
-        }
-
-    }
-
-    override fun getMemberScope() = memberScope
-}
-
-/**
- * The package fragment that redirects all requests for classifier lookup to its targets.
- */
-class ClassifierAliasingPackageFragmentDescriptor(
-    targets: List<KonanPackageFragment>,
-    module: ModuleDescriptor,
-    fqName: FqName
-) : PackageFragmentDescriptorImpl(module, fqName) {
-
-    private val memberScope = object : MemberScopeImpl() {
-
-        override fun getContributedClassifier(name: Name, location: LookupLocation) =
-            targets.firstNotNullResult {
-                if (it.hasTopLevelClassifier(name)) {
-                    it.getMemberScope().getContributedClassifier(name, location)
-                } else {
-                    null
-                }
-            }
-
-        override fun printScopeStructure(p: Printer) {
-            p.println(this::class.java.simpleName, " {")
-            p.pushIndent()
-
-            p.println("targets = $targets")
-
-            p.popIndent()
-            p.println("}")
-        }
-    }
-
-    override fun getMemberScope(): MemberScope = memberScope
-}
-
-
-/**
- * Package fragment which creates descriptors for forward declarations on demand.
- */
-private class ForwardDeclarationsPackageFragmentDescriptor(
-    storageManager: StorageManager,
-    module: ModuleDescriptor,
-    fqName: FqName,
-    supertypeName: Name,
-    classKind: ClassKind
-) : PackageFragmentDescriptorImpl(module, fqName) {
-
-    private val memberScope = object : MemberScopeImpl() {
-
-        private val declarations = storageManager.createMemoizedFunction(this::createDeclaration)
-
-        private val supertype by storageManager.createLazyValue {
-            val descriptor = builtIns.builtInsModule.getPackage(ForwardDeclarationsFqNames.packageName)
-                .memberScope
-                .getContributedClassifier(supertypeName, NoLookupLocation.FROM_BACKEND) as ClassDescriptor
-
-            descriptor.defaultType
-        }
-
-        private fun createDeclaration(name: Name): ClassDescriptor {
-            return ClassDescriptorImpl(
-                this@ForwardDeclarationsPackageFragmentDescriptor,
-                name,
-                Modality.FINAL,
-                classKind,
-                listOf(supertype),
-                SourceElement.NO_SOURCE,
-                false,
-                LockBasedStorageManager.NO_LOCKS
-            ).apply {
-                this.initialize(MemberScope.Empty, emptySet(), null)
-            }
-        }
-
-        override fun getContributedClassifier(name: Name, location: LookupLocation) = declarations(name)
-
-        override fun printScopeStructure(p: Printer) {
-            p.println(this::class.java.simpleName, "{}")
-        }
-    }
-
-    override fun getMemberScope(): MemberScope = memberScope
-}

konan/library-reader/src/org/jetbrains/kotlin/serialization/konan/impl/KonanResolvedModuleDescriptorsFactoryImpl.kt

@@ -1,144 +0,0 @@
-/*
- * Copyright 2010-2018 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.serialization.konan.impl
-
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.config.LanguageVersionSettings
-import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl
-import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
-import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl
-import org.jetbrains.kotlin.descriptors.konan.KonanModuleOrigin
-import org.jetbrains.kotlin.descriptors.konan.SyntheticModulesOrigin
-import org.jetbrains.kotlin.incremental.components.LookupLocation
-import org.jetbrains.kotlin.incremental.components.NoLookupLocation
-import org.jetbrains.kotlin.konan.library.KonanLibrary
-import org.jetbrains.kotlin.konan.library.resolver.KonanLibraryResolveResult
-import org.jetbrains.kotlin.konan.library.resolver.PackageAccessedHandler
-import org.jetbrains.kotlin.konan.util.profile
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
-import org.jetbrains.kotlin.resolve.scopes.MemberScope
-import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl
-import org.jetbrains.kotlin.serialization.konan.KonanDeserializedModuleDescriptorFactory
-import org.jetbrains.kotlin.serialization.konan.KonanResolvedModuleDescriptors
-import org.jetbrains.kotlin.serialization.konan.KonanResolvedModuleDescriptorsFactory
-import org.jetbrains.kotlin.storage.LockBasedStorageManager
-import org.jetbrains.kotlin.storage.StorageManager
-import org.jetbrains.kotlin.storage.getValue
-import org.jetbrains.kotlin.utils.Printer
-
-class KonanResolvedModuleDescriptorsFactoryImpl(
-    override val moduleDescriptorFactory: KonanDeserializedModuleDescriptorFactory
-) : KonanResolvedModuleDescriptorsFactory {
-
-    override fun createResolved(
-        resolvedLibraries: KonanLibraryResolveResult,
-        storageManager: StorageManager,
-        builtIns: KotlinBuiltIns?,
-        languageVersionSettings: LanguageVersionSettings,
-        customAction: ((KonanLibrary, ModuleDescriptorImpl) -> Unit)?,
-        customCapabilitiesGenerator: ((KonanLibrary) -> Map<ModuleDescriptor.Capability<*>, Any?>)?
-    ): KonanResolvedModuleDescriptors {
-
-        val moduleDescriptors = mutableListOf<ModuleDescriptorImpl>()
-        @Suppress("NAME_SHADOWING")
-        var builtIns = builtIns
-
-        // Build module descriptors.
-        resolvedLibraries.forEach { library, packageAccessedHandler ->
-            profile("Loading ${library.libraryName}") {
-
-                val customCapabilities = customCapabilitiesGenerator?.invoke(library) ?: emptyMap()
-
-                // MutableModuleContext needs ModuleDescriptorImpl, rather than ModuleDescriptor.
-                val moduleDescriptor = createDescriptorOptionalBuiltsIns(
-                    library, languageVersionSettings, storageManager, builtIns, packageAccessedHandler, customCapabilities
-                )
-                builtIns = moduleDescriptor.builtIns
-                moduleDescriptors.add(moduleDescriptor)
-
-                customAction?.invoke(library, moduleDescriptor)
-            }
-        }
-
-        val forwardDeclarationsModule = createForwardDeclarationsModule(builtIns, storageManager)
-
-        // Set inter-dependencies between module descriptors, add forwarding declarations module.
-        for (module in moduleDescriptors) {
-            // Yes, just to all of them.
-            module.setDependencies(moduleDescriptors + forwardDeclarationsModule)
-        }
-
-        return KonanResolvedModuleDescriptors(moduleDescriptors, forwardDeclarationsModule)
-    }
-
-    private fun createForwardDeclarationsModule(
-        builtIns: KotlinBuiltIns?,
-        storageManager: StorageManager
-    ): ModuleDescriptorImpl {
-
-        val name = Name.special("<forward declarations>")
-        val module = createDescriptorOptionalBuiltsIns(name, storageManager, builtIns, SyntheticModulesOrigin)
-
-        val packageFragmentProvider =
-            moduleDescriptorFactory.packageFragmentsFactory.createForwardDeclarationHackPackagePartProvider(storageManager, module)
-
-        module.initialize(packageFragmentProvider)
-        module.setDependencies(module)
-
-        return module
-    }
-
-    private fun createDescriptorOptionalBuiltsIns(
-        name: Name,
-        storageManager: StorageManager,
-        builtIns: KotlinBuiltIns?,
-        moduleOrigin: KonanModuleOrigin
-    ) = if (builtIns != null)
-        moduleDescriptorFactory.descriptorFactory.createDescriptor(name, storageManager, builtIns, moduleOrigin)
-    else
-        moduleDescriptorFactory.descriptorFactory.createDescriptorAndNewBuiltIns(name, storageManager, moduleOrigin)
-
-    private fun createDescriptorOptionalBuiltsIns(
-        library: KonanLibrary,
-        languageVersionSettings: LanguageVersionSettings,
-        storageManager: StorageManager,
-        builtIns: KotlinBuiltIns?,
-        packageAccessedHandler: PackageAccessedHandler?,
-        customCapabilities: Map<ModuleDescriptor.Capability<*>, Any?>
-    ) = if (builtIns != null)
-        moduleDescriptorFactory.createDescriptor(
-            library,
-            languageVersionSettings,
-            storageManager,
-            builtIns,
-            packageAccessedHandler,
-            customCapabilities
-        )
-    else
-        moduleDescriptorFactory.createDescriptorAndNewBuiltIns(
-            library,
-            languageVersionSettings,
-            storageManager,
-            packageAccessedHandler,
-            customCapabilities
-        )
-}
-
-// FIXME(ddol): decouple and move interop-specific logic back to Kotlin/Native.
-internal object ForwardDeclarationsFqNames {
-
-    val packageName = FqName("kotlinx.cinterop")
-
-    val cNames = FqName("cnames")
-    val cNamesStructs = cNames.child(Name.identifier("structs"))
-
-    val objCNames = FqName("objcnames")
-    val objCNamesClasses = objCNames.child(Name.identifier("classes"))
-    val objCNamesProtocols = objCNames.child(Name.identifier("protocols"))
-}