From 5411b85cb92d2b4613d531c4336a178c578e18cb Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Mon, 30 Mar 2020 19:29:09 +0700 Subject: [PATCH] Minor. Rename isKonanStdlib() into isNativeStdlib() --- .../konan/NativeDistributionCommonizer.kt | 5 ++--- .../jetbrains/kotlin/descriptors/konan/utils.kt | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 native/frontend/src/org/jetbrains/kotlin/descriptors/konan/utils.kt diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt index 59e20fb28ee..fb7fe4309b2 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/NativeDistributionCommonizer.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl import org.jetbrains.kotlin.descriptors.commonizer.* import org.jetbrains.kotlin.descriptors.commonizer.Target import org.jetbrains.kotlin.descriptors.commonizer.utils.ResettableClockMark +import org.jetbrains.kotlin.descriptors.konan.NATIVE_STDLIB_MODULE_NAME import org.jetbrains.kotlin.konan.library.* import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.library.KotlinLibrary @@ -229,9 +230,7 @@ class NativeDistributionCommonizer( } private companion object { - val stdlibName = Name.special("<$KONAN_STDLIB_NAME>") - fun shouldBeSerialized(libraryName: Name) = - libraryName != stdlibName && libraryName != KlibResolvedModuleDescriptorsFactoryImpl.FORWARD_DECLARATIONS_MODULE_NAME + libraryName != NATIVE_STDLIB_MODULE_NAME && libraryName != KlibResolvedModuleDescriptorsFactoryImpl.FORWARD_DECLARATIONS_MODULE_NAME } } diff --git a/native/frontend/src/org/jetbrains/kotlin/descriptors/konan/utils.kt b/native/frontend/src/org/jetbrains/kotlin/descriptors/konan/utils.kt new file mode 100644 index 00000000000..705a0c52995 --- /dev/null +++ b/native/frontend/src/org/jetbrains/kotlin/descriptors/konan/utils.kt @@ -0,0 +1,14 @@ +/* + * Copyright 2010-2020 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.KONAN_STDLIB_NAME +import org.jetbrains.kotlin.name.Name + +val NATIVE_STDLIB_MODULE_NAME = Name.special("<$KONAN_STDLIB_NAME>") + +fun ModuleDescriptor.isNativeStdlib() = name == NATIVE_STDLIB_MODULE_NAME