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

[FIR] Fix captured type parameters propagation in deserialization

Browse Source
This commit is contained in:
simon.ogorodnik
2020-04-07 23:44:52 +03:00
parent 356e42196c
commit af27ca013b
7 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt
Vendored
+6 -6
View File
@@ -1,18 +1,18 @@
public final class A<TA> : R|kotlin/Any| {
public constructor<TA>(): R|test/A<TA>|
public final inner class B<TB> : R|kotlin/Any| {
public constructor<TB>(): R|test/A.B<TB>|
public final inner class B<TB, TA> : R|kotlin/Any| {
public constructor<TB>(): R|test/A.B<TB, TA>|
public final inner class C<TC> : R|kotlin/Any| {
public constructor<TC>(): R|test/A.B.C<TC>|
public final inner class C<TC, TB, TA> : R|kotlin/Any| {
public constructor<TC>(): R|test/A.B.C<TC, TB, TA>|
public final inner class D<TD> : R|kotlin/Any| {
public final inner class D<TD, TC, TB, TA> : R|kotlin/Any| {
public final fun bar(ta: R|TA|, tb: R|TB|, tc: R|TC|, td: R|TD|): R|test/A.B.C.D<TD, TC, TB, TA>|
public final fun <P1, P2, P3, P4> foo(p1: R|P1|, p2: R|P2|, p3: R|P3|, p4: R|P4|): R|kotlin/Nothing|
public constructor<TD>(): R|test/A.B.C.D<TD>|
public constructor<TD>(): R|test/A.B.C.D<TD, TC, TB, TA>|
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt
Vendored
+3 -2
View File
@@ -1,9 +1,10 @@
public final class InnerClassReferencesOuterTP<P> : R|kotlin/Any| {
public constructor<P>(): R|test/InnerClassReferencesOuterTP<P>|
public final inner class Inner<Q : R|P|> : R|kotlin/Any| {
public constructor<Q : R|P|>(): R|test/InnerClassReferencesOuterTP.Inner<Q>|
public final inner class Inner<Q : R|P|, P> : R|kotlin/Any| {
public constructor<Q : R|P|>(): R|test/InnerClassReferencesOuterTP.Inner<Q, P>|
}
}
compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
Vendored
+3 -2
View File
@@ -1,7 +1,7 @@
public final class MembersReferenceOuterTP<P> : R|kotlin/Any| {
public constructor<P>(): R|test/MembersReferenceOuterTP<P>|
public final inner class Inner : R|kotlin/Any| {
public final inner class Inner<P> : R|kotlin/Any| {
public final fun <Q : R|P|> f(): R|kotlin/Unit|
public final fun g(p: R|P|): R|P|
@@ -12,8 +12,9 @@ public final class MembersReferenceOuterTP<P> : R|kotlin/Any| {
public final val <Q : R|P|> R|Q|.w: R|Q|
public get(): R|Q|
public constructor(): R|test/MembersReferenceOuterTP.Inner|
public constructor(): R|test/MembersReferenceOuterTP.Inner<P>|
}
}