diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt index f6252bab57c..e39953737e5 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt @@ -254,13 +254,8 @@ class FirElementSerializer private constructor( } } - private fun FirPropertyAccessor.nonSourceAnnotations(session: FirSession, property: FirProperty): List = - (this as FirAnnotationContainer).nonSourceAnnotations(session) + property.nonSourceAnnotations(session).filter { - val useSiteTarget = it.useSiteTarget - useSiteTarget == AnnotationUseSiteTarget.PROPERTY_GETTER && isGetter || - useSiteTarget == AnnotationUseSiteTarget.PROPERTY_SETTER && isSetter || - useSiteTarget == AnnotationUseSiteTarget.SETTER_PARAMETER && isSetter - } + private fun FirPropertyAccessor.nonSourceAnnotations(session: FirSession): List = + (this as FirAnnotationContainer).nonSourceAnnotations(session) fun propertyProto(property: FirProperty): ProtoBuf.Property.Builder? = whileAnalysing(session, property) { if (!extension.shouldSerializeProperty(property)) return null @@ -300,7 +295,7 @@ class FirElementSerializer private constructor( builder.setterFlags = accessorFlags } - val nonSourceAnnotations = setter.nonSourceAnnotations(session, property) + val nonSourceAnnotations = setter.nonSourceAnnotations(session) if (Flags.IS_NOT_DEFAULT.get(accessorFlags)) { val setterLocal = local.createChildSerializer(setter) for (valueParameterDescriptor in setter.valueParameters) { @@ -865,7 +860,7 @@ class FirElementSerializer private constructor( private fun getAccessorFlags(accessor: FirPropertyAccessor, property: FirProperty): Int { // [FirDefaultPropertyAccessor]---a property accessor without body---can still hold other information, such as annotations, // user-contributed visibility, and modifiers, such as `external` or `inline`. - val nonSourceAnnotations = accessor.nonSourceAnnotations(session, property) + val nonSourceAnnotations = accessor.nonSourceAnnotations(session) val isDefault = accessor is FirDefaultPropertyAccessor && nonSourceAnnotations.isEmpty() && accessor.visibility == property.visibility &&