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

[IR BE] Remap dispatch receiver for inner ctor too

Browse Source 
- do not forget to add into mapping dispatch receiver
 - fix KT-40686 (at least part of it)
 - add test
This commit is contained in:
Roman Artemev
2020-11-09 17:06:42 +03:00
parent 1ced0138ff
commit 94acfa50bd
10 changed files with 74 additions and 2 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
@@ -15337,6 +15337,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("innerWithDefaultInner.kt")
public void testInnerWithDefaultInner() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.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
+10 -2
View File
@@ -97,10 +97,18 @@ private fun InnerClassesSupport.primaryConstructorParameterMap(originalConstruct
val loweredConstructor = getInnerClassConstructorWithOuterThisParameter(originalConstructor)
originalConstructor.valueParameters.forEach { old ->
oldConstructorParameterToNew[old] = loweredConstructor.valueParameters[old.index + 1]
var index = 0
originalConstructor.dispatchReceiverParameter?.let {
oldConstructorParameterToNew[it] = loweredConstructor.valueParameters[index++]
}
originalConstructor.valueParameters.forEach { old ->
oldConstructorParameterToNew[old] = loweredConstructor.valueParameters[index++]
}
assert(loweredConstructor.valueParameters.size == index)
return oldConstructorParameterToNew
}
compiler/testData/codegen/box/innerNested/innerWithDefaultInner.kt
Vendored
+24
View File
@@ -0,0 +1,24 @@
// KT-40686
class Outer(val o: String, val oo: String) {
inner class InnerArg(val i: String) {
val result: String get() = o + i
}
inner class InnerParam(val i: InnerArg = InnerArg("B")) {
fun foo() = i.result + oo
}
}
fun box(): String {
val o = Outer("A", "C")
val i = o.InnerParam()
val rr = i.foo()
if (rr != "ABC") return "FAIL: $rr"
return "OK"
}
compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
Generated
+5
View File
@@ -16737,6 +16737,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("innerWithDefaultInner.kt")
public void testInnerWithDefaultInner() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.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
@@ -16737,6 +16737,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("innerWithDefaultInner.kt")
public void testInnerWithDefaultInner() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.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
@@ -15337,6 +15337,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("innerWithDefaultInner.kt")
public void testInnerWithDefaultInner() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.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
@@ -13302,6 +13302,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("innerWithDefaultInner.kt")
public void testInnerWithDefaultInner() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.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
@@ -13302,6 +13302,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("innerWithDefaultInner.kt")
public void testInnerWithDefaultInner() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.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
@@ -13367,6 +13367,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("innerWithDefaultInner.kt")
public void testInnerWithDefaultInner() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.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/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -7632,6 +7632,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultArgument.kt");
}
@TestMetadata("innerWithDefaultInner.kt")
public void testInnerWithDefaultInner() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/innerWithDefaultInner.kt");
}
@TestMetadata("kt3132.kt")
public void testKt3132() throws Exception {
runTest("compiler/testData/codegen/box/innerNested/kt3132.kt");