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

Fix deserialization of default property accessor flags

Browse Source 
In MemberDeserializer.loadProperty, we incorrectly passed 0 to
getAnnotations when loading annotations on property accessors in case
the protobuf field getter_flags/setter_flags was not present. The
correct behavior, as described in metadata.proto, was to pass a special
"default accessor flags" value, constructed from the main property
flags. Otherwise in case there were annotations both on the property and
on the accessor (as in PropertyAndAccessor.kt) and the accessor was
otherwise default, we would assume that it had no annotations and would
not load them in compiler and reflection

 #KT-25499 In Progress
This commit is contained in:
Alexander Udalov
2018-08-31 18:26:23 +02:00
parent a432704c4f
commit 06ce0cb0f0
17 changed files with 142 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
+17 -8
View File
@@ -67,11 +67,20 @@ class MemberDeserializer(private val c: DeserializationContext) {
}
)
// Per documentation on Property.getter_flags in metadata.proto, if an accessor flags field is absent, its value should be computed
// by taking hasAnnotations/visibility/modality from property flags, and using false for the rest
val defaultAccessorFlags = Flags.getAccessorFlags(
Flags.HAS_ANNOTATIONS.get(flags),
Flags.VISIBILITY.get(flags),
Flags.MODALITY.get(flags),
false, false, false
)
val getter = if (hasGetter) {
val getterFlags = proto.getterFlags
val isNotDefault = proto.hasGetterFlags() && Flags.IS_NOT_DEFAULT.get(getterFlags)
val isExternal = proto.hasGetterFlags() && Flags.IS_EXTERNAL_ACCESSOR.get(getterFlags)
val isInline = proto.hasGetterFlags() && Flags.IS_INLINE_ACCESSOR.get(getterFlags)
val getterFlags = if (proto.hasGetterFlags()) proto.getterFlags else defaultAccessorFlags
val isNotDefault = Flags.IS_NOT_DEFAULT.get(getterFlags)
val isExternal = Flags.IS_EXTERNAL_ACCESSOR.get(getterFlags)
val isInline = Flags.IS_INLINE_ACCESSOR.get(getterFlags)
val annotations = getAnnotations(proto, getterFlags, AnnotatedCallableKind.PROPERTY_GETTER)
val getter = if (isNotDefault) {
PropertyGetterDescriptorImpl(
@@ -94,10 +103,10 @@ class MemberDeserializer(private val c: DeserializationContext) {
}
val setter = if (Flags.HAS_SETTER.get(flags)) {
val setterFlags = proto.setterFlags
val isNotDefault = proto.hasSetterFlags() && Flags.IS_NOT_DEFAULT.get(setterFlags)
val isExternal = proto.hasSetterFlags() && Flags.IS_EXTERNAL_ACCESSOR.get(setterFlags)
val isInline = proto.hasSetterFlags() && Flags.IS_INLINE_ACCESSOR.get(setterFlags)
val setterFlags = if (proto.hasSetterFlags()) proto.setterFlags else defaultAccessorFlags
val isNotDefault = Flags.IS_NOT_DEFAULT.get(setterFlags)
val isExternal = Flags.IS_EXTERNAL_ACCESSOR.get(setterFlags)
val isInline = Flags.IS_INLINE_ACCESSOR.get(setterFlags)
val annotations = getAnnotations(proto, setterFlags, AnnotatedCallableKind.PROPERTY_SETTER)
if (isNotDefault) {
val setter = PropertySetterDescriptorImpl(