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

Change BACKING_FIELD_REQUIRED from SetSlice

Browse Source
This commit is contained in:
Kristoffer Andersen
2022-07-18 14:41:40 +02:00
committed by Alexander Udalov
parent f0bc021b5e
commit 8d79fab109
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/cfg/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProviderImpl.kt
+1 -1
View File
@@ -484,7 +484,7 @@ class ControlFlowInformationProviderImpl private constructor(
val variableDescriptor = ctxt.variableDescriptor val variableDescriptor = ctxt.variableDescriptor
val mayBeInitializedNotHere = ctxt.enterInitState?.mayBeInitialized() ?: false val mayBeInitializedNotHere = ctxt.enterInitState?.mayBeInitialized() ?: false
val hasBackingField = (variableDescriptor as? PropertyDescriptor)?.let { val hasBackingField = (variableDescriptor as? PropertyDescriptor)?.let {
trace.get(BACKING_FIELD_REQUIRED, it) trace.get(BACKING_FIELD_REQUIRED, it) ?: false
} ?: true } ?: true
if (variableDescriptor is PropertyDescriptor && variableDescriptor.isVar) { if (variableDescriptor is PropertyDescriptor && variableDescriptor.isVar) {
val descriptor = getEnclosingDescriptor(trace.bindingContext, expression) val descriptor = getEnclosingDescriptor(trace.bindingContext, expression)
compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java
+1 -2
View File
@@ -192,7 +192,7 @@ public interface BindingContext {
WritableSlice<Box<DeferredType>, Boolean> DEFERRED_TYPE = Slices.createCollectiveSetSlice(); WritableSlice<Box<DeferredType>, Boolean> DEFERRED_TYPE = Slices.createCollectiveSetSlice();
WritableSlice<PropertyDescriptor, Boolean> BACKING_FIELD_REQUIRED = new SetSlice<PropertyDescriptor>(DO_NOTHING) { WritableSlice<PropertyDescriptor, Boolean> BACKING_FIELD_REQUIRED = new BasicWritableSlice<PropertyDescriptor, Boolean>(DO_NOTHING) {
@Override @Override
public Boolean computeValue( public Boolean computeValue(
SlicedMap map, SlicedMap map,
@@ -203,7 +203,6 @@ public interface BindingContext {
if (propertyDescriptor.getKind() != CallableMemberDescriptor.Kind.DECLARATION) { if (propertyDescriptor.getKind() != CallableMemberDescriptor.Kind.DECLARATION) {
return false; return false;
} }
backingFieldRequired = valueNotFound ? false : backingFieldRequired;
PsiElement declarationPsiElement = DescriptorToSourceUtils.descriptorToDeclaration(propertyDescriptor); PsiElement declarationPsiElement = DescriptorToSourceUtils.descriptorToDeclaration(propertyDescriptor);
if (declarationPsiElement instanceof KtParameter) { if (declarationPsiElement instanceof KtParameter) {
KtParameter jetParameter = (KtParameter) declarationPsiElement; KtParameter jetParameter = (KtParameter) declarationPsiElement;