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

JVM: rename this$0 when regenerating nested objects too

Browse Source 
In the old backend, this was unnecessary because nested objects would
reference their lambdas' captures through the original this$0. On
JVM_IR, using loose capture fields means a name/descriptor clash can
occur on any level of nesting, not just the top.
This commit is contained in:
pyos
2021-02-03 14:52:14 +01:00
committed by max-kammerer
parent ec89cb2313
commit 1310a65f0c
13 changed files with 180 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxInlineCodegenTestGenerated.java
Generated
+12
View File
@@ -647,6 +647,18 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_3.kt");
}
@Test
@TestMetadata("kt8668_nested.kt")
public void testKt8668_nested() throws Exception {
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_nested.kt");
}
@Test
@TestMetadata("kt8668_nested_2.kt")
public void testKt8668_nested_2() throws Exception {
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_nested_2.kt");
}
@Test
@TestMetadata("twoDifferentDispatchReceivers.kt")
public void testTwoDifferentDispatchReceivers() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/CompileKotlinAgainstInlineKotlinTestGenerated.java
Generated
+12
View File
@@ -647,6 +647,18 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_3.kt");
}
@Test
@TestMetadata("kt8668_nested.kt")
public void testKt8668_nested() throws Exception {
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_nested.kt");
}
@Test
@TestMetadata("kt8668_nested_2.kt")
public void testKt8668_nested_2() throws Exception {
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_nested_2.kt");
}
@Test
@TestMetadata("twoDifferentDispatchReceivers.kt")
public void testTwoDifferentDispatchReceivers() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxInlineCodegenTestGenerated.java
Generated
+12
View File
@@ -647,6 +647,18 @@ public class IrBlackBoxInlineCodegenTestGenerated extends AbstractIrBlackBoxInli
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_3.kt");
}
@Test
@TestMetadata("kt8668_nested.kt")
public void testKt8668_nested() throws Exception {
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_nested.kt");
}
@Test
@TestMetadata("kt8668_nested_2.kt")
public void testKt8668_nested_2() throws Exception {
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_nested_2.kt");
}
@Test
@TestMetadata("twoDifferentDispatchReceivers.kt")
public void testTwoDifferentDispatchReceivers() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrCompileKotlinAgainstInlineKotlinTestGenerated.java
Generated
+12
View File
@@ -647,6 +647,18 @@ public class IrCompileKotlinAgainstInlineKotlinTestGenerated extends AbstractIrC
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_3.kt");
}
@Test
@TestMetadata("kt8668_nested.kt")
public void testKt8668_nested() throws Exception {
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_nested.kt");
}
@Test
@TestMetadata("kt8668_nested_2.kt")
public void testKt8668_nested_2() throws Exception {
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_nested_2.kt");
}
@Test
@TestMetadata("twoDifferentDispatchReceivers.kt")
public void testTwoDifferentDispatchReceivers() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmIrAgainstOldBoxInlineTestGenerated.java
Generated
+12
View File
@@ -647,6 +647,18 @@ public class JvmIrAgainstOldBoxInlineTestGenerated extends AbstractJvmIrAgainstO
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_3.kt");
}
@Test
@TestMetadata("kt8668_nested.kt")
public void testKt8668_nested() throws Exception {
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_nested.kt");
}
@Test
@TestMetadata("kt8668_nested_2.kt")
public void testKt8668_nested_2() throws Exception {
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_nested_2.kt");
}
@Test
@TestMetadata("twoDifferentDispatchReceivers.kt")
public void testTwoDifferentDispatchReceivers() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmOldAgainstIrBoxInlineTestGenerated.java
Generated
+12
View File
@@ -647,6 +647,18 @@ public class JvmOldAgainstIrBoxInlineTestGenerated extends AbstractJvmOldAgainst
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_3.kt");
}
@Test
@TestMetadata("kt8668_nested.kt")
public void testKt8668_nested() throws Exception {
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_nested.kt");
}
@Test
@TestMetadata("kt8668_nested_2.kt")
public void testKt8668_nested_2() throws Exception {
runTest("compiler/testData/codegen/boxInline/anonymousObject/twoCapturedReceivers/kt8668_nested_2.kt");
}
@Test
@TestMetadata("twoDifferentDispatchReceivers.kt")
public void testTwoDifferentDispatchReceivers() throws Exception {