From 1a3515dbab149fec361b41ced249d0bb851a8e4e Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 9 Mar 2021 13:03:13 +0300 Subject: [PATCH] [Commonizer] Use Flag.Class.IS_VALUE instead of Flag.Class.IS_INLINE Also: Rename CirClass.isInline to CirClass.isValue --- .../kotlin/descriptors/commonizer/cir/CirClass.kt | 8 ++++---- .../kotlin/descriptors/commonizer/cir/RecursionMarkers.kt | 2 +- .../kotlin/descriptors/commonizer/core/ClassCommonizer.kt | 8 ++++---- .../descriptors/commonizer/core/TypeAliasCommonizer.kt | 2 +- .../descriptors/commonizer/metadata/CirDeserializers.kt | 4 ++-- .../kotlin/descriptors/commonizer/metadata/flags.kt | 6 +++--- .../descriptors/commonizer/core/TypeCommonizerTest.kt | 2 +- .../kotlin/descriptors/commonizer/utils/mocks.kt | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClass.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClass.kt index 3f3c2e6b043..73cc4b41424 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClass.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/CirClass.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.descriptors.Visibility interface CirClass : CirClassifier, CirContainingClass { var companion: CirName? // null means no companion object val isCompanion: Boolean - val isInline: Boolean + val isValue: Boolean val isInner: Boolean val isExternal: Boolean val supertypes: Collection @@ -31,7 +31,7 @@ interface CirClass : CirClassifier, CirContainingClass { companion: CirName?, isCompanion: Boolean, isData: Boolean, - isInline: Boolean, + isValue: Boolean, isInner: Boolean, isExternal: Boolean ): CirClass = CirClassImpl( @@ -44,7 +44,7 @@ interface CirClass : CirClassifier, CirContainingClass { companion = companion, isCompanion = isCompanion, isData = isData, - isInline = isInline, + isValue = isValue, isInner = isInner, isExternal = isExternal ) @@ -61,7 +61,7 @@ data class CirClassImpl( override var companion: CirName?, override val isCompanion: Boolean, override val isData: Boolean, - override val isInline: Boolean, + override val isValue: Boolean, override val isInner: Boolean, override val isExternal: Boolean, ) : CirClass { diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/RecursionMarkers.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/RecursionMarkers.kt index f1bf232d6a2..93150ec5e50 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/RecursionMarkers.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cir/RecursionMarkers.kt @@ -17,7 +17,7 @@ object CirClassRecursionMarker : CirClass, CirRecursionMarker { set(_) = unsupported() override val isCompanion get() = unsupported() override val isData get() = unsupported() - override val isInline get() = unsupported() + override val isValue get() = unsupported() override val isInner get() = unsupported() override val isExternal get() = unsupported() override val supertypes get() = unsupported() diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassCommonizer.kt index 46a1d20ee0e..5ed76a7f29d 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/ClassCommonizer.kt @@ -17,7 +17,7 @@ class ClassCommonizer(classifiers: CirKnownClassifiers) : AbstractStandardCommon private val modality = ModalityCommonizer() private val visibility = VisibilityCommonizer.equalizing() private var isInner = false - private var isInline = false + private var isValue = false private var isCompanion = false override fun commonizationResult() = CirClass.create( @@ -30,7 +30,7 @@ class ClassCommonizer(classifiers: CirKnownClassifiers) : AbstractStandardCommon companion = null, isCompanion = isCompanion, isData = false, - isInline = isInline, + isValue = isValue, isInner = isInner, isExternal = false ) @@ -39,14 +39,14 @@ class ClassCommonizer(classifiers: CirKnownClassifiers) : AbstractStandardCommon name = first.name kind = first.kind isInner = first.isInner - isInline = first.isInline + isValue = first.isValue isCompanion = first.isCompanion } override fun doCommonizeWith(next: CirClass) = kind == next.kind && isInner == next.isInner - && isInline == next.isInline + && isValue == next.isValue && isCompanion == next.isCompanion && modality.commonizeWith(next.modality) && visibility.commonizeWith(next) diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeAliasCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeAliasCommonizer.kt index 5b2b1eb91e1..97ad2eb98b9 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeAliasCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/core/TypeAliasCommonizer.kt @@ -121,7 +121,7 @@ private class TypeAliasExpectClassCommonizer : AbstractStandardCommonizer() { companion = null, isCompanion = false, isData = false, - isInline = false, + isValue = false, isInner = false, isExternal = false ) diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt index 02acae2828e..06afad2a406 100644 --- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/utils/mocks.kt @@ -64,7 +64,7 @@ internal val MOCK_CLASSIFIERS = CirKnownClassifiers( companion = null, isCompanion = false, isData = false, - isInline = false, + isValue = false, isInner = false, isExternal = false )