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

Do not write hasAnnotations flag for properties with source-only annotations

Browse Source 
This does not break or fix any behavior except the fact that
deserialization will now not try loading annotations on a property which
had no binary- or runtime-retained annotations in the sources
This commit is contained in:
Alexander Udalov
2018-08-16 12:26:07 +02:00
parent 87c0d56618
commit ca3cff9a93
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
+3 -5
View File
@@ -164,9 +164,7 @@ class DescriptorSerializer private constructor(
val hasConstant = compileTimeConstant != null && compileTimeConstant !is NullValue val hasConstant = compileTimeConstant != null && compileTimeConstant !is NullValue
val hasAnnotations = val hasAnnotations =
!descriptor.annotations.isEmpty() || hasAnnotations(descriptor) || hasAnnotations(descriptor.backingField) || hasAnnotations(descriptor.delegateField)
descriptor.backingField?.annotations?.isEmpty() == false ||
descriptor.delegateField?.annotations?.isEmpty() == false
val propertyFlags = Flags.getAccessorFlags( val propertyFlags = Flags.getAccessorFlags(
hasAnnotations, hasAnnotations,
@@ -751,8 +749,8 @@ class DescriptorSerializer private constructor(
Variance.OUT_VARIANCE -> ProtoBuf.Type.Argument.Projection.OUT Variance.OUT_VARIANCE -> ProtoBuf.Type.Argument.Projection.OUT
} }
private fun hasAnnotations(descriptor: Annotated): Boolean = private fun hasAnnotations(descriptor: Annotated?): Boolean =
descriptor.nonSourceAnnotations.isNotEmpty() descriptor != null && descriptor.nonSourceAnnotations.isNotEmpty()
fun <T : DeclarationDescriptor> sort(descriptors: Collection<T>): List<T> = fun <T : DeclarationDescriptor> sort(descriptors: Collection<T>): List<T> =
ArrayList(descriptors).apply { ArrayList(descriptors).apply {