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

[Commonizer] Fix HAS_ANNOTATIONS flag calculation for serialized classes

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-01-30 00:06:08 +03:00
parent b39a205671
commit 9d6c0e56ed
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/flags.kt
+5
View File
@@ -104,6 +104,11 @@ internal fun CirTypeAlias.typeAliasFlags(): Flags =
private inline val CirHasAnnotations.hasAnnotationsFlag: Flag? private inline val CirHasAnnotations.hasAnnotationsFlag: Flag?
get() = if (annotations.isNotEmpty()) Flag.Common.HAS_ANNOTATIONS else null get() = if (annotations.isNotEmpty()) Flag.Common.HAS_ANNOTATIONS else null
// Since 1.4.30 a special @JvmInline annotation is generated to distinguish JVM-inline from value classes.
// This has an effect on class serialization: Every class with isInline == true automatically gets HAS_ANNOTATIONS flag.
private inline val CirClass.hasAnnotationsFlag: Flag?
get() = if (annotations.isNotEmpty() || isInline) Flag.Common.HAS_ANNOTATIONS else null
private inline val CirProperty.hasAnnotationsFlag: Flag? private inline val CirProperty.hasAnnotationsFlag: Flag?
get() = if (annotations.isNotEmpty() || !backingFieldAnnotations.isNullOrEmpty() || !delegateFieldAnnotations.isNullOrEmpty()) get() = if (annotations.isNotEmpty() || !backingFieldAnnotations.isNullOrEmpty() || !delegateFieldAnnotations.isNullOrEmpty())
Flag.Common.HAS_ANNOTATIONS Flag.Common.HAS_ANNOTATIONS