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

FirElementSerializer: drop no longer necessary code for accessor annotations

Browse Source
This commit is contained in:
Mikhail Glukhikh
2023-01-25 12:26:25 +01:00
committed by Space Team
parent bebb9b1392
commit 9378da6f27
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt
+4 -9
View File
@@ -254,13 +254,8 @@ class FirElementSerializer private constructor(
}
}
private fun FirPropertyAccessor.nonSourceAnnotations(session: FirSession, property: FirProperty): List<FirAnnotation> =
(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<FirAnnotation> =
(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 &&