diff --git a/compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProviderImpl.kt b/compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProviderImpl.kt index 86cae2900e9..c824a2247e2 100644 --- a/compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProviderImpl.kt +++ b/compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProviderImpl.kt @@ -484,7 +484,7 @@ class ControlFlowInformationProviderImpl private constructor( val variableDescriptor = ctxt.variableDescriptor val mayBeInitializedNotHere = ctxt.enterInitState?.mayBeInitialized() ?: false val hasBackingField = (variableDescriptor as? PropertyDescriptor)?.let { - trace.get(BACKING_FIELD_REQUIRED, it) + trace.get(BACKING_FIELD_REQUIRED, it) ?: false } ?: true if (variableDescriptor is PropertyDescriptor && variableDescriptor.isVar) { val descriptor = getEnclosingDescriptor(trace.bindingContext, expression) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java index 49b3ea959d4..e3fa1bacbe4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java @@ -192,7 +192,7 @@ public interface BindingContext { WritableSlice, Boolean> DEFERRED_TYPE = Slices.createCollectiveSetSlice(); - WritableSlice BACKING_FIELD_REQUIRED = new SetSlice(DO_NOTHING) { + WritableSlice BACKING_FIELD_REQUIRED = new BasicWritableSlice(DO_NOTHING) { @Override public Boolean computeValue( SlicedMap map, @@ -203,7 +203,6 @@ public interface BindingContext { if (propertyDescriptor.getKind() != CallableMemberDescriptor.Kind.DECLARATION) { return false; } - backingFieldRequired = valueNotFound ? false : backingFieldRequired; PsiElement declarationPsiElement = DescriptorToSourceUtils.descriptorToDeclaration(propertyDescriptor); if (declarationPsiElement instanceof KtParameter) { KtParameter jetParameter = (KtParameter) declarationPsiElement;