Move KonanBuiltIns to a separate module (#1860)

1. Separate (temporary) modules for the code to be moved to https://github.com/JetBrains/kotlin repo
2. KonanBuiltIns, functions for creation of module descriptors and interop descriptors and moved to "konan.descriptors" module 
3. Re-organizing KonanModuleOrigin and it's inheritors to better naming/understanding
This commit is contained in:
Dmitriy Dolovov
2018-08-14 13:20:28 +03:00
committed by GitHub
parent 6064cc9a34
commit a4a235be42
45 changed files with 489 additions and 447 deletions
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.cli.klib
// TODO: Extract `library` package as a shared jar?
import org.jetbrains.kotlin.backend.konan.isStdlib
import org.jetbrains.kotlin.backend.konan.library.impl.LibraryReaderImpl
import org.jetbrains.kotlin.backend.konan.library.impl.UnzippedKonanLibrary
import org.jetbrains.kotlin.backend.konan.library.impl.ZippedKonanLibrary
@@ -26,6 +25,7 @@ import org.jetbrains.kotlin.config.ApiVersion
import org.jetbrains.kotlin.config.LanguageVersion
import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
import org.jetbrains.kotlin.descriptors.konan.isKonanStdlib
import org.jetbrains.kotlin.konan.file.File
import org.jetbrains.kotlin.konan.library.KonanLibrarySearchPathResolver
import org.jetbrains.kotlin.konan.target.Distribution
@@ -146,7 +146,7 @@ class Library(val name: String, val requestedRepository: String?, val target: St
val versionSpec = LanguageVersionSettingsImpl(currentLanguageVersion, currentApiVersion)
val module = reader.moduleDescriptor(versionSpec)
val defaultModules = mutableListOf<ModuleDescriptorImpl>()
if (!module.isStdlib()) {
if (!module.isKonanStdlib()) {
val resolver = KonanLibrarySearchPathResolver(emptyList(),
target = null,
distributionKlib = Distribution().klib,