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

Change VARIABLE_REASSIGNMENT slice so it composes properly

Browse Source
This commit is contained in:
Kristoffer Andersen
2022-06-24 12:56:50 +02:00
committed by Alexander Udalov
parent 7bc0132cca
commit f0bc021b5e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java
+1 -1
View File
@@ -171,7 +171,7 @@ public interface BindingContext {
WritableSlice<ScriptDescriptor, LexicalScope> SCRIPT_SCOPE = Slices.createSimpleSlice(); WritableSlice<ScriptDescriptor, LexicalScope> SCRIPT_SCOPE = Slices.createSimpleSlice();
WritableSlice<KtExpression, Boolean> VARIABLE_REASSIGNMENT = Slices.createSimpleSetSlice(); WritableSlice<KtExpression, Boolean> VARIABLE_REASSIGNMENT = new BasicWritableSlice<>(DO_NOTHING);
WritableSlice<ValueParameterDescriptor, Boolean> AUTO_CREATED_IT = Slices.createSimpleSetSlice(); WritableSlice<ValueParameterDescriptor, Boolean> AUTO_CREATED_IT = Slices.createSimpleSetSlice();
WritableSlice<Pair<AnonymousFunctionDescriptor, Integer>, Boolean> SUSPEND_LAMBDA_PARAMETER_USED = Slices.createSimpleSlice(); WritableSlice<Pair<AnonymousFunctionDescriptor, Integer>, Boolean> SUSPEND_LAMBDA_PARAMETER_USED = Slices.createSimpleSlice();
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/BindingUtils.java
+2 -1
View File
@@ -140,7 +140,8 @@ public final class BindingUtils {
} }
public static boolean isVariableReassignment(@NotNull BindingContext context, @NotNull KtExpression expression) { public static boolean isVariableReassignment(@NotNull BindingContext context, @NotNull KtExpression expression) {
return BindingContextUtils.getNotNull(context, BindingContext.VARIABLE_REASSIGNMENT, expression); Boolean result = context.get(BindingContext.VARIABLE_REASSIGNMENT, expression);
return (result != null) ? result : false;
} }
@Nullable @Nullable