[FIR] Fix dispatch receivers on inner classes' constructors

1. Inner class constructor should have its outer class as a dispatch
receiver, since it is necessary for the call. Before it was null
2. Substituted inner class constructor should have its original dispatch
 receiver type with the proper substitution. Before it was set to the
 class itself (since the class was usually passed as a new dispatch
 receiver)

Also, modify FIR renderer, so it properly renders the dispatch receiver
of the constructors
This commit is contained in:
Roman Golyshev
2021-09-28 16:40:18 +03:00
committed by Space
parent 8673819260
commit 9b9c51bc8d
65 changed files with 169 additions and 129 deletions
@@ -4,17 +4,17 @@ public open class DeeplyInnerClass : R|kotlin/Any| {
public/*package*/ open inner class A : R|kotlin/Any| {
public/*package*/ open fun a(): R|kotlin/Unit|
public/*package*/ constructor(): R|test/DeeplyInnerClass.A|
public/*package*/ test/DeeplyInnerClass.constructor(): R|test/DeeplyInnerClass.A|
public/*package*/ open inner class B : R|kotlin/Any| {
public/*package*/ open fun b(): R|kotlin/Unit|
public/*package*/ constructor(): R|test/DeeplyInnerClass.A.B|
public/*package*/ test/DeeplyInnerClass.A.constructor(): R|test/DeeplyInnerClass.A.B|
public/*package*/ open inner class C : R|kotlin/Any| {
public/*package*/ open fun c(): R|kotlin/Unit|
public/*package*/ constructor(): R|test/DeeplyInnerClass.A.B.C|
public/*package*/ test/DeeplyInnerClass.A.B.constructor(): R|test/DeeplyInnerClass.A.B.C|
}
}
@@ -13,7 +13,7 @@ public final enum class Enum : R|kotlin/Enum<ft<test/Enum, test/Enum?>>| {
public/*package*/ open fun valueOf(s: R|ft<kotlin/String, kotlin/String?>|): R|kotlin/Unit|
public constructor(): R|test/Enum.Inner|
public test/Enum.constructor(): R|test/Enum.Inner|
}
public open class Nested : R|kotlin/Any| {
@@ -4,7 +4,7 @@ public open class InnerClass : R|kotlin/Any| {
public open inner class Inner : R|kotlin/Any| {
public open fun foo(): R|kotlin/Unit|
public constructor(): R|test/InnerClass.Inner|
public test/InnerClass.constructor(): R|test/InnerClass.Inner|
}
public open class Nested : R|kotlin/Any| {