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

[Commonizer] Fix property backing/delegate field annotations serialization

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-01-29 23:29:51 +03:00
parent 3b91d1c5e5
commit 80b95a22a4
2 changed files with 7 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/builders.kt
+1
View File
@@ -151,6 +151,7 @@ internal fun CirProperty.buildProperty(
getterFlags = getter?.propertyAccessorFlags(this, this) ?: NO_FLAGS, getterFlags = getter?.propertyAccessorFlags(this, this) ?: NO_FLAGS,
setterFlags = setter?.let { setter -> setter.propertyAccessorFlags(setter, this) } ?: NO_FLAGS setterFlags = setter?.let { setter -> setter.propertyAccessorFlags(setter, this) } ?: NO_FLAGS
).also { property -> ).also { property ->
// TODO unclear where to write backing/delegate field annotations, see KT-44625
annotations.mapTo(property.annotations) { it.buildAnnotation() } annotations.mapTo(property.annotations) { it.buildAnnotation() }
getter?.annotations?.mapTo(property.getterAnnotations) { it.buildAnnotation() } getter?.annotations?.mapTo(property.getterAnnotations) { it.buildAnnotation() }
setter?.annotations?.mapTo(property.setterAnnotations) { it.buildAnnotation() } setter?.annotations?.mapTo(property.setterAnnotations) { it.buildAnnotation() }
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/metadata/flags.kt
+6
View File
@@ -104,6 +104,12 @@ 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
private inline val CirProperty.hasAnnotationsFlag: Flag?
get() = if (annotations.isNotEmpty() || !backingFieldAnnotations.isNullOrEmpty() || !delegateFieldAnnotations.isNullOrEmpty())
Flag.Common.HAS_ANNOTATIONS
else
null
private inline val CirHasVisibility.visibilityFlag: Flag private inline val CirHasVisibility.visibilityFlag: Flag
get() = when (visibility) { get() = when (visibility) {
DescriptorVisibilities.PUBLIC -> Flag.Common.IS_PUBLIC DescriptorVisibilities.PUBLIC -> Flag.Common.IS_PUBLIC