From 993b0c9f6f35c6a10dedb87426d09840ea603828 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Mon, 30 Mar 2020 19:28:57 +0700 Subject: [PATCH] Minor. Rename isKonanStdlib() into isNativeStdlib() (cherry picked from commit abbd01b1e0c91e22d80592534a4a0773f15bee1b) --- .../backend/konan/TopDownAnalyzerFacadeForKonan.kt | 4 ++-- .../kotlin/backend/konan/ToplevelPhases.kt | 4 ++-- .../kotlin/backend/konan/descriptors/utils.kt | 13 ++++++------- .../backend/konan/objcexport/ObjCExportLazy.kt | 4 ++-- .../backend/konan/objcexport/ObjCExportNamer.kt | 4 ++-- .../kotlin/org/jetbrains/kotlin/cli/klib/main.kt | 4 ++-- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/TopDownAnalyzerFacadeForKonan.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/TopDownAnalyzerFacadeForKonan.kt index 0b0341f90f1..f26b8f66ec3 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/TopDownAnalyzerFacadeForKonan.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/TopDownAnalyzerFacadeForKonan.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.context.ProjectContext import org.jetbrains.kotlin.descriptors.PackageFragmentProvider import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.descriptors.konan.CurrentKlibModuleOrigin -import org.jetbrains.kotlin.backend.konan.descriptors.isKonanStdlib +import org.jetbrains.kotlin.descriptors.konan.isNativeStdlib import org.jetbrains.kotlin.konan.file.File import org.jetbrains.kotlin.konan.util.KlibMetadataFactories import org.jetbrains.kotlin.library.KotlinLibrary @@ -52,7 +52,7 @@ internal object TopDownAnalyzerFacadeForKonan { config.friendModuleFiles) val additionalPackages = mutableListOf() - if (!module.isKonanStdlib()) { + if (!module.isNativeStdlib()) { val dependencies = listOf(module) + resolvedDependencies.moduleDescriptors.resolvedDescriptors + resolvedDependencies.moduleDescriptors.forwardDeclarationsModule module.setDependencies(dependencies, resolvedDependencies.friends) } else { diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt index 0a513309f68..bc5e76b9adc 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ToplevelPhases.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.config.languageVersionSettings import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.kotlin.backend.konan.descriptors.isKonanStdlib +import org.jetbrains.kotlin.descriptors.konan.isNativeStdlib import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.ir.declarations.IrModuleFragment import org.jetbrains.kotlin.ir.symbols.IrSymbol @@ -257,7 +257,7 @@ internal val psiToIrPhase = konanUnitPhase( functionIrClassFactory.module = (listOf(irModule!!) + deserializer.modules.values) - .single { it.descriptor.isKonanStdlib() } + .single { it.descriptor.isNativeStdlib() } }, name = "Psi2Ir", description = "Psi to IR conversion", diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/utils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/utils.kt index 0c58830c41e..ea14c29580f 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/utils.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/descriptors/utils.kt @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.descriptors.konan.DeserializedKlibModuleOrigin import org.jetbrains.kotlin.descriptors.konan.klibModuleOrigin import org.jetbrains.kotlin.descriptors.konan.kotlinLibrary import org.jetbrains.kotlin.konan.library.KLIB_INTEROP_IR_PROVIDER_IDENTIFIER -import org.jetbrains.kotlin.konan.library.KONAN_STDLIB_NAME import org.jetbrains.kotlin.library.BaseKotlinLibrary import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.descriptors.* @@ -51,8 +50,12 @@ fun DeclarationDescriptor.findTopLevelDescriptor(): DeclarationDescriptor { else this.containingDeclaration!!.findTopLevelDescriptor() } -val ModuleDescriptor.isForwardDeclarationModule get() = - name == Name.special("") +val ModuleDescriptor.isForwardDeclarationModule: Boolean + get() { + // TODO: use KlibResolvedModuleDescriptorsFactoryImpl.FORWARD_DECLARATIONS_MODULE_NAME instead of + // manually created Name instance + return name == Name.special("") + } fun BaseKotlinLibrary.isInteropLibrary() = manifestProperties["ir_provider"] == KLIB_INTEROP_IR_PROVIDER_IDENTIFIER @@ -60,7 +63,3 @@ fun BaseKotlinLibrary.isInteropLibrary() = fun ModuleDescriptor.isFromInteropLibrary() = if (klibModuleOrigin !is DeserializedKlibModuleOrigin) false else kotlinLibrary.isInteropLibrary() - -private val STDLIB_MODULE_NAME = Name.special("<$KONAN_STDLIB_NAME>") - -fun ModuleDescriptor.isKonanStdlib() = name == STDLIB_MODULE_NAME diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazy.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazy.kt index 1fe46614a5f..e8fd3115bd7 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazy.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportLazy.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.backend.konan.objcexport import com.intellij.psi.PsiElement import org.jetbrains.kotlin.analyzer.ModuleInfo -import org.jetbrains.kotlin.backend.konan.descriptors.isKonanStdlib +import org.jetbrains.kotlin.descriptors.konan.isNativeStdlib import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations @@ -445,7 +445,7 @@ private fun createNamerConfiguration(configuration: ObjCExportLazy.Configuration // TODO: find proper solution. private fun ModuleDescriptor.isStdlib(): Boolean = - this.builtIns == this || this.isCommonStdlib() || this.isKonanStdlib() + this.builtIns == this || this.isCommonStdlib() || this.isNativeStdlib() private val kotlinSequenceClassId = ClassId.topLevel(FqName("kotlin.sequences.Sequence")) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt index bd4947140b3..09a94a6f21e 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/objcexport/ObjCExportNamer.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.backend.konan.objcexport import org.jetbrains.kotlin.backend.konan.cKeywords import org.jetbrains.kotlin.backend.konan.descriptors.isArray import org.jetbrains.kotlin.backend.konan.descriptors.isInterface -import org.jetbrains.kotlin.backend.konan.descriptors.isKonanStdlib +import org.jetbrains.kotlin.descriptors.konan.isNativeStdlib import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.incremental.components.NoLookupLocation @@ -855,7 +855,7 @@ private fun ObjCExportMapper.canHaveSameName(first: PropertyDescriptor, second: } internal val ModuleDescriptor.namePrefix: String get() { - if (this.isKonanStdlib()) return "Kotlin" + if (this.isNativeStdlib()) return "Kotlin" return abbreviate(this.name.asString().let { it.substring(1, it.lastIndex) }) } diff --git a/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt b/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt index 8d3d22ce26d..e5a4c507e34 100644 --- a/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt +++ b/klib/src/main/kotlin/org/jetbrains/kotlin/cli/klib/main.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.konan.util.DependencyProcessor import org.jetbrains.kotlin.library.unpackZippedKonanLibraryTo import org.jetbrains.kotlin.konan.util.KlibMetadataFactories import org.jetbrains.kotlin.backend.common.serialization.metadata.DynamicTypeDeserializer -import org.jetbrains.kotlin.backend.konan.descriptors.isKonanStdlib +import org.jetbrains.kotlin.descriptors.konan.isNativeStdlib import org.jetbrains.kotlin.builtins.konan.KonanBuiltIns import org.jetbrains.kotlin.descriptors.deserialization.PlatformDependentTypeTransformer import org.jetbrains.kotlin.util.Logger @@ -167,7 +167,7 @@ class Library(val name: String, val requestedRepository: String?, val target: St val module = KlibFactories.DefaultDeserializedDescriptorFactory.createDescriptorAndNewBuiltIns(library, versionSpec, storageManager, null) val defaultModules = mutableListOf() - if (!module.isKonanStdlib()) { + if (!module.isNativeStdlib()) { val resolver = resolverByName( emptyList(), distributionKlib = Distribution().klib,