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

Recapture shared variables when calling local class constructor

Browse Source 
When a local function or class A creates an instance of a local class B
capturing an outer variable 'x', it should use ref for 'x', but not the
value of 'x'.
This commit is contained in:
Dmitry Petrov
2017-10-13 12:59:16 +03:00
parent 7a156e4407
commit cbef372e69
8 changed files with 127 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+14 -5
View File
@@ -1086,11 +1086,15 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
}
for (Map.Entry<DeclarationDescriptor, EnclosedValueDescriptor> entry : closure.getCaptureVariables().entrySet()) {
Type sharedVarType = typeMapper.getSharedVarType(entry.getKey());
DeclarationDescriptor declarationDescriptor = entry.getKey();
EnclosedValueDescriptor valueDescriptor = entry.getValue();
Type sharedVarType = typeMapper.getSharedVarType(declarationDescriptor);
boolean asSharedVar = sharedVarType != null;
if (sharedVarType == null) {
sharedVarType = typeMapper.mapType((VariableDescriptor) entry.getKey());
sharedVarType = typeMapper.mapType((VariableDescriptor) declarationDescriptor);
}
StackValue capturedVar = lookupOuterValue(entry.getValue());
StackValue capturedVar = lookupOuterValue(valueDescriptor, asSharedVar);
callGenerator.putCapturedValueOnStack(capturedVar, sharedVarType, paramIndex++);
}
@@ -1144,11 +1148,16 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
}
@NotNull
public StackValue lookupOuterValue(EnclosedValueDescriptor d) {
private StackValue lookupOuterValue(EnclosedValueDescriptor d, boolean asSharedVar) {
DeclarationDescriptor descriptor = d.getDescriptor();
for (LocalLookup.LocalLookupCase aCase : LocalLookup.LocalLookupCase.values()) {
if (aCase.isCase(descriptor)) {
return aCase.outerValue(d, this);
StackValue outerValue = aCase.outerValue(d, this);
if (asSharedVar && outerValue instanceof StackValue.FieldForSharedVar) {
StackValue.FieldForSharedVar fieldForSharedVar = (StackValue.FieldForSharedVar) outerValue;
return fieldForSharedVar.receiver;
}
return outerValue;
}
}
throw new IllegalStateException("Can't get outer value in " + this + " for " + d);
compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass1.kt
Vendored
+12
View File
@@ -0,0 +1,12 @@
fun box(): String {
var x = ""
class CapturesX {
override fun toString() = x
}
fun localFun() = CapturesX()
x = "OK"
return localFun().toString()
}
compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass2.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
fun box(): String {
var x = ""
class CapturesX {
override fun toString() = x
}
fun outerFun1(): CapturesX {
fun localFun() = CapturesX()
return localFun()
}
x = "OK"
return outerFun1().toString()
}
compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass3.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
fun box(): String {
var x = ""
class CapturesX {
override fun toString() = x
}
class LocalClass {
fun foo() = CapturesX()
}
x = "OK"
return LocalClass().foo().toString()
}
compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
+18
View File
@@ -11306,6 +11306,24 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
doTest(fileName);
}
@TestMetadata("recaptureVarCapturedInLocalClass1.kt")
public void testRecaptureVarCapturedInLocalClass1() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass1.kt");
doTest(fileName);
}
@TestMetadata("recaptureVarCapturedInLocalClass2.kt")
public void testRecaptureVarCapturedInLocalClass2() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass2.kt");
doTest(fileName);
}
@TestMetadata("recaptureVarCapturedInLocalClass3.kt")
public void testRecaptureVarCapturedInLocalClass3() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass3.kt");
doTest(fileName);
}
@TestMetadata("subclassingExtensionReceiverClass.kt")
public void testSubclassingExtensionReceiverClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/subclassingExtensionReceiverClass.kt");
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
+18
View File
@@ -11306,6 +11306,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest(fileName);
}
@TestMetadata("recaptureVarCapturedInLocalClass1.kt")
public void testRecaptureVarCapturedInLocalClass1() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass1.kt");
doTest(fileName);
}
@TestMetadata("recaptureVarCapturedInLocalClass2.kt")
public void testRecaptureVarCapturedInLocalClass2() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass2.kt");
doTest(fileName);
}
@TestMetadata("recaptureVarCapturedInLocalClass3.kt")
public void testRecaptureVarCapturedInLocalClass3() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass3.kt");
doTest(fileName);
}
@TestMetadata("subclassingExtensionReceiverClass.kt")
public void testSubclassingExtensionReceiverClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/subclassingExtensionReceiverClass.kt");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+18
View File
@@ -11318,6 +11318,24 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
doTest(fileName);
}
@TestMetadata("recaptureVarCapturedInLocalClass1.kt")
public void testRecaptureVarCapturedInLocalClass1() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass1.kt");
doTest(fileName);
}
@TestMetadata("recaptureVarCapturedInLocalClass2.kt")
public void testRecaptureVarCapturedInLocalClass2() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass2.kt");
doTest(fileName);
}
@TestMetadata("recaptureVarCapturedInLocalClass3.kt")
public void testRecaptureVarCapturedInLocalClass3() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass3.kt");
doTest(fileName);
}
@TestMetadata("withclosure.kt")
public void testWithclosure() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/withclosure.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
+18
View File
@@ -12512,6 +12512,24 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
doTest(fileName);
}
@TestMetadata("recaptureVarCapturedInLocalClass1.kt")
public void testRecaptureVarCapturedInLocalClass1() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass1.kt");
doTest(fileName);
}
@TestMetadata("recaptureVarCapturedInLocalClass2.kt")
public void testRecaptureVarCapturedInLocalClass2() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass2.kt");
doTest(fileName);
}
@TestMetadata("recaptureVarCapturedInLocalClass3.kt")
public void testRecaptureVarCapturedInLocalClass3() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/recaptureVarCapturedInLocalClass3.kt");
doTest(fileName);
}
@TestMetadata("subclassingExtensionReceiverClass.kt")
public void testSubclassingExtensionReceiverClass() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/subclassingExtensionReceiverClass.kt");