From db65e8d2c3d005a38aaa9c7a89b3a77e30721b8b Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 6 Oct 2020 18:00:48 +0300 Subject: [PATCH] kotlinx-metadata: Wrong interpretation of Flag.Constructor.IS_PRIMARY ^KT-42429 (cherry picked from commit d6390b31c0dfbc71b9012f71a7c829b473c14c86) --- .../kotlin/native/interop/gen/StubIrMetadataEmitter.kt | 2 +- .../kotlin/org/jetbrains/kotlin/klib/metadata/KmComparator.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt index 8f82dcc0413..3421a20f79a 100644 --- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt +++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt @@ -359,7 +359,7 @@ private class MappingExtensions( val ConstructorStub.flags: Flags get() = flagsOfNotNull( - isSecondaryConstructorFlag.takeIf { !isPrimary }, + Flag.Constructor.IS_SECONDARY.takeIf { !isPrimary }, Flag.HAS_ANNOTATIONS.takeIf { annotations.isNotEmpty() } ) or visibility.flags diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/klib/metadata/KmComparator.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/klib/metadata/KmComparator.kt index c71e427bcf9..0a14a87e364 100644 --- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/klib/metadata/KmComparator.kt +++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/klib/metadata/KmComparator.kt @@ -143,7 +143,7 @@ internal class KmComparator(private val configuration: ComparisonConfig) { )(flags1, flags2) private fun compareConstructorFlags(flags1: Flags, flags2: Flags): MetadataCompareResult = serialComparator( - checkFlag(Flag.Constructor.IS_PRIMARY) to "IS_PRIMARY mismatch" + checkFlag(Flag.Constructor.IS_SECONDARY) to "IS_SECONDARY mismatch" )(flags1, flags2) private fun compare(constructor1: KmConstructor, constructor2: KmConstructor): MetadataCompareResult = serialComparator(