diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt index 86922ae9b46..be140999d61 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.builder.* import org.jetbrains.kotlin.fir.declarations.impl.* +import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.builder.buildExpressionStub import org.jetbrains.kotlin.fir.symbols.CallableId @@ -223,16 +224,17 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { isInline = Flags.IS_INLINE_ACCESSOR.get(getterFlags) isExternal = Flags.IS_EXTERNAL_ACCESSOR.get(getterFlags) } - annotations += - c.annotationDeserializer.loadPropertyGetterAnnotations( - c.containerSource, proto, local.nameResolver, local.typeTable, getterFlags - ) this.symbol = FirPropertyAccessorSymbol() }.apply { versionRequirementsTable = c.versionRequirementTable } } else { FirDefaultPropertyGetter(null, c.session, FirDeclarationOrigin.Library, returnTypeRef, visibility) + }.apply { + (annotations as MutableList) += + c.annotationDeserializer.loadPropertyGetterAnnotations( + c.containerSource, proto, local.nameResolver, local.typeTable, getterFlags + ) } } else { null @@ -253,10 +255,6 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { isInline = Flags.IS_INLINE_ACCESSOR.get(setterFlags) isExternal = Flags.IS_EXTERNAL_ACCESSOR.get(setterFlags) } - annotations += - c.annotationDeserializer.loadPropertySetterAnnotations( - c.containerSource, proto, local.nameResolver, local.typeTable, setterFlags - ) this.symbol = FirPropertyAccessorSymbol() valueParameters += local.memberDeserializer.valueParameters( listOf(proto.setterValueParameter), @@ -269,6 +267,11 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { } } else { FirDefaultPropertySetter(null, c.session, FirDeclarationOrigin.Library, returnTypeRef, visibility) + }.apply { + (annotations as MutableList) += + c.annotationDeserializer.loadPropertySetterAnnotations( + c.containerSource, proto, local.nameResolver, local.typeTable, setterFlags + ) } } else { null diff --git a/compiler/testData/codegen/box/jvmPackageName/metadataField.kt b/compiler/testData/codegen/box/jvmPackageName/metadataField.kt index 1043a7391a2..7efd2b4eb9e 100644 --- a/compiler/testData/codegen/box/jvmPackageName/metadataField.kt +++ b/compiler/testData/codegen/box/jvmPackageName/metadataField.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // WITH_RUNTIME diff --git a/compiler/testData/compileKotlinAgainstKotlin/jvmNames.kt b/compiler/testData/compileKotlinAgainstKotlin/jvmNames.kt index 750c56d7ba2..88011ca28c9 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/jvmNames.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/jvmNames.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: A.kt diff --git a/compiler/testData/compileKotlinAgainstKotlin/targetedJvmName.kt b/compiler/testData/compileKotlinAgainstKotlin/targetedJvmName.kt index 74e763e383a..8a62410214c 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/targetedJvmName.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/targetedJvmName.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_FIR: JVM_IR // TARGET_BACKEND: JVM // FILE: A.kt package lib