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

[IR BE] Remap references in default arg value in inner class constructor

Browse Source 
Make sure that there is no reference into zombie declarations.

 - fix KT-40771
 - add test
This commit is contained in:
Roman Artemev
2020-10-05 22:31:06 +03:00
parent f597585ffb
commit a52e045c91
9 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -15055,6 +15055,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/innerNested/innerSimple.kt");
}
@TestMetadata("innerWithDefaultArgument.kt")
public void testInnerWithDefaultArgument() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("kt3132.kt")
public void testKt3132() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/InnerClassesLowering.kt
+2 -1
View File
@@ -46,10 +46,11 @@ class InnerClassesLowering(val context: BackendContext, private val innerClasses
val newConstructor = lowerConstructor(declaration)
val oldConstructorParameterToNew = innerClassesSupport.primaryConstructorParameterMap(declaration)
val variableRemapper = VariableRemapper(oldConstructorParameterToNew)
for ((oldParam, newParam) in oldConstructorParameterToNew.entries) {
newParam.defaultValue = oldParam.defaultValue?.let { oldDefault ->
context.irFactory.createExpressionBody(oldDefault.startOffset, oldDefault.endOffset) {
expression = oldDefault.expression.patchDeclarationParents(newConstructor)
expression = oldDefault.expression.transform(variableRemapper, null).patchDeclarationParents(newConstructor)
}
}
}
compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt
Vendored
+14
View File
@@ -0,0 +1,14 @@
// KT-40771
class Outer(val o: String, val oo: String = o) {
inner class Inner(val k: String, val kk: String = k)
}
fun box(): String {
val o = Outer("O")
val i = o.Inner("K")
return o.oo + i.kk
}
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -16450,6 +16450,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/innerNested/innerSimple.kt");
}
@TestMetadata("innerWithDefaultArgument.kt")
public void testInnerWithDefaultArgument() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("kt3132.kt")
public void testKt3132() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -16450,6 +16450,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/innerNested/innerSimple.kt");
}
@TestMetadata("innerWithDefaultArgument.kt")
public void testInnerWithDefaultArgument() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("kt3132.kt")
public void testKt3132() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -15055,6 +15055,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/innerNested/innerSimple.kt");
}
@TestMetadata("innerWithDefaultArgument.kt")
public void testInnerWithDefaultArgument() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("kt3132.kt")
public void testKt3132() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
Generated
+5
View File
@@ -13055,6 +13055,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/innerNested/innerSimple.kt");
}
@TestMetadata("innerWithDefaultArgument.kt")
public void testInnerWithDefaultArgument() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("kt3132.kt")
public void testKt3132() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -13055,6 +13055,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/innerNested/innerSimple.kt");
}
@TestMetadata("innerWithDefaultArgument.kt")
public void testInnerWithDefaultArgument() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("kt3132.kt")
public void testKt3132() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
Generated
+5
View File
@@ -13120,6 +13120,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/innerNested/innerSimple.kt");
}
@TestMetadata("innerWithDefaultArgument.kt")
public void testInnerWithDefaultArgument() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("kt3132.kt")
public void testKt3132() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");