azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kotlinx-metadata: Wrong interpretation of Flag.Constructor.IS_PRIMARY

Browse Source 
^KT-42429

(cherry picked from commit d6390b31c0dfbc71b9012f71a7c829b473c14c86)
This commit is contained in:
Dmitriy Dolovov
2020-10-06 18:00:48 +03:00
committed by Vasily Levchenko
parent 59c0d4b189
commit db65e8d2c3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/StubIrMetadataEmitter.kt
+1 -1
View File
@@ -359,7 +359,7 @@ private class MappingExtensions(
val ConstructorStub.flags: Flags val ConstructorStub.flags: Flags
get() = flagsOfNotNull( get() = flagsOfNotNull(
isSecondaryConstructorFlag.takeIf { !isPrimary }, Flag.Constructor.IS_SECONDARY.takeIf { !isPrimary },
Flag.HAS_ANNOTATIONS.takeIf { annotations.isNotEmpty() } Flag.HAS_ANNOTATIONS.takeIf { annotations.isNotEmpty() }
) or visibility.flags ) or visibility.flags
build-tools/src/main/kotlin/org/jetbrains/kotlin/klib/metadata/KmComparator.kt
+1 -1
View File
@@ -143,7 +143,7 @@ internal class KmComparator(private val configuration: ComparisonConfig) {
)(flags1, flags2) )(flags1, flags2)
private fun compareConstructorFlags(flags1: Flags, flags2: Flags): MetadataCompareResult = serialComparator( 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) )(flags1, flags2)
private fun compare(constructor1: KmConstructor, constructor2: KmConstructor): MetadataCompareResult = serialComparator( private fun compare(constructor1: KmConstructor, constructor2: KmConstructor): MetadataCompareResult = serialComparator(