diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/localDeclarationWithExpression.lazyBodies.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/localDeclarationWithExpression.lazyBodies.txt index 17cb4b80584..daaa6b12b81 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/localDeclarationWithExpression.lazyBodies.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/localDeclarationWithExpression.lazyBodies.txt @@ -1,5 +1,5 @@ FILE: localDeclarationWithExpression.kt private final? val nonLocalProperty: Listby LAZY_EXPRESSION - public? get(): { + private get(): { ^ D|/nonLocalProperty|.getValue#(Null(null), ::R|/nonLocalProperty|) } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/localDeclarationWithExpression.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/localDeclarationWithExpression.txt index cfbce47feae..fda28d35c3e 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/localDeclarationWithExpression.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/localDeclarationWithExpression.txt @@ -4,6 +4,6 @@ FILE: localDeclarationWithExpression.kt localProperty# } ) - public? get(): { + private get(): { ^ D|/nonLocalProperty|.getValue#(Null(null), ::R|/nonLocalProperty|) } diff --git a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt index 735db8c0144..38778e5c092 100644 --- a/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt +++ b/compiler/fir/raw-fir/raw-fir.common/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt @@ -441,14 +441,15 @@ fun FirPropertyBuilder.generateAccessorsByDelegate( if (getter == null || getter is FirDefaultPropertyAccessor) { val annotations = getter?.annotations val returnTarget = FirFunctionTarget(null, isLambda = false) + val getterStatus = getter?.status getter = buildPropertyAccessor { this.source = fakeSource this.moduleData = moduleData origin = FirDeclarationOrigin.Source returnTypeRef = buildImplicitTypeRef() isGetter = true - status = FirDeclarationStatusImpl(Visibilities.Unknown, Modality.FINAL).apply { - isInline = this@generateAccessorsByDelegate.getter?.status?.isInline ?: isInline + status = FirDeclarationStatusImpl(getterStatus?.visibility ?: Visibilities.Unknown, Modality.FINAL).apply { + isInline = getterStatus?.isInline ?: isInline } symbol = FirPropertyAccessorSymbol() @@ -479,14 +480,15 @@ fun FirPropertyBuilder.generateAccessorsByDelegate( if (isVar && (setter == null || setter is FirDefaultPropertyAccessor)) { val annotations = setter?.annotations val parameterAnnotations = setter?.valueParameters?.firstOrNull()?.annotations + val setterStatus = setter?.status setter = buildPropertyAccessor { this.source = fakeSource this.moduleData = moduleData origin = FirDeclarationOrigin.Source returnTypeRef = moduleData.session.builtinTypes.unitType isGetter = false - status = FirDeclarationStatusImpl(Visibilities.Unknown, Modality.FINAL).apply { - isInline = this@generateAccessorsByDelegate.setter?.status?.isInline ?: isInline + status = FirDeclarationStatusImpl(setterStatus?.visibility ?: Visibilities.Unknown, Modality.FINAL).apply { + isInline = setterStatus?.isInline ?: isInline } val parameter = buildValueParameter { source = fakeSource diff --git a/compiler/testData/codegen/box/delegatedProperty/privateSetterKPropertyIsNotMutable.kt b/compiler/testData/codegen/box/delegatedProperty/privateSetterKPropertyIsNotMutable.kt index 03b8f0d20c0..c1d18db654c 100644 --- a/compiler/testData/codegen/box/delegatedProperty/privateSetterKPropertyIsNotMutable.kt +++ b/compiler/testData/codegen/box/delegatedProperty/privateSetterKPropertyIsNotMutable.kt @@ -1,7 +1,4 @@ -// IGNORE_BACKEND_FIR: JVM_IR -// FIR status: Fail: property.set should cause IllegalCallableAccessException // TARGET_BACKEND: JVM - // WITH_REFLECT import kotlin.reflect.KProperty