K2: use MutableOrEmptyList for annotations storage in FIR elements

This commit is contained in:
Mikhail Glukhikh
2022-12-14 16:53:40 +01:00
committed by Space Team
parent be5394e211
commit 582b640bec
306 changed files with 1168 additions and 203 deletions
@@ -223,8 +223,9 @@ fun deserializeClassToSymbol(
(member as FirProperty?)?.returnTypeRef?.coneTypeSafe()
} ?: computeValueClassRepresentation(this, session)
(annotations as MutableList<FirAnnotation>) +=
replaceAnnotations(
context.annotationDeserializer.loadClassAnnotations(classProto, context.nameResolver)
)
versionRequirementsTable = context.versionRequirementTable
@@ -266,10 +266,11 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
effectiveVisibility
)
}.apply {
(annotations as MutableList<FirAnnotation>) +=
replaceAnnotations(
c.annotationDeserializer.loadPropertyGetterAnnotations(
c.containerSource, proto, local.nameResolver, local.typeTable, getterFlags
)
)
containingClassForStaticMemberAttr = c.dispatchReceiver?.lookupTag
}
}
@@ -324,10 +325,11 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
effectiveVisibility
)
}.apply {
(annotations as MutableList<FirAnnotation>) +=
replaceAnnotations(
c.annotationDeserializer.loadPropertySetterAnnotations(
c.containerSource, proto, local.nameResolver, local.typeTable, setterFlags
)
)
containingClassForStaticMemberAttr = c.dispatchReceiver?.lookupTag
}
}