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

FIR: fix FirDefaultPropertyAccessor phase to BODY_RESOLVE

Browse Source
This commit is contained in:
Ilya Kirillov
2021-04-13 12:54:47 +02:00
committed by TeamCityServer
parent 39b2cd1027
commit 0cf00d0f72
27 changed files with 3738 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.dot
Vendored
+31 -45
View File
@@ -27,10 +27,10 @@ digraph inAnonymousObject_kt {
}
0 -> {1};
1 -> {2};
1 -> {13 18 16 21 23 29} [color=red];
1 -> {13 16 19 25} [color=red];
2 -> {3};
2 -> {13 29 9} [color=green];
2 -> {13 29 9} [style=dashed];
2 -> {13 25 9} [color=green];
2 -> {13 25 9} [style=dashed];
3 -> {4};
4 -> {5};
5 -> {6};
@@ -38,11 +38,11 @@ digraph inAnonymousObject_kt {
7 -> {8};
9 -> {10} [color=green];
10 -> {11} [style=dotted];
10 -> {18} [color=green];
10 -> {18} [style=dashed];
10 -> {16} [color=green];
10 -> {16} [style=dashed];
11 -> {12} [style=dotted];
11 -> {23} [color=green];
11 -> {23} [style=dashed];
11 -> {19} [color=green];
11 -> {19} [style=dashed];
subgraph cluster_3 {
color=red
@@ -55,61 +55,47 @@ digraph inAnonymousObject_kt {
subgraph cluster_4 {
color=red
16 [label="Enter function getter" style="filled" fillcolor=red];
17 [label="Exit function getter" style="filled" fillcolor=red];
16 [label="Enter property" style="filled" fillcolor=red];
17 [label="Access variable R|<local>/a|"];
18 [label="Exit property" style="filled" fillcolor=red];
}
16 -> {17};
17 -> {18};
18 -> {11} [color=green];
subgraph cluster_5 {
color=red
18 [label="Enter property" style="filled" fillcolor=red];
19 [label="Access variable R|<local>/a|"];
20 [label="Exit property" style="filled" fillcolor=red];
19 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_6 {
color=blue
20 [label="Enter block"];
21 [label="Access variable R|<local>/b|"];
22 [label="Assignment: R|/<anonymous>.leaked|"];
23 [label="Exit block"];
}
24 [label="Exit init block" style="filled" fillcolor=red];
}
18 -> {19};
19 -> {20};
20 -> {11} [color=green];
subgraph cluster_6 {
color=red
21 [label="Enter function getter" style="filled" fillcolor=red];
22 [label="Exit function getter" style="filled" fillcolor=red];
}
20 -> {21};
21 -> {22};
22 -> {23};
23 -> {24};
24 -> {12} [color=green];
subgraph cluster_7 {
color=red
23 [label="Enter init block" style="filled" fillcolor=red];
25 [label="Enter function run" style="filled" fillcolor=red];
subgraph cluster_8 {
color=blue
24 [label="Enter block"];
25 [label="Access variable R|<local>/b|"];
26 [label="Assignment: R|/<anonymous>.leaked|"];
27 [label="Exit block"];
26 [label="Enter block"];
27 [label="Function call: R|<local>/c|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
28 [label="Exit block"];
}
28 [label="Exit init block" style="filled" fillcolor=red];
29 [label="Exit function run" style="filled" fillcolor=red];
}
23 -> {24};
24 -> {25};
25 -> {26};
26 -> {27};
27 -> {28};
28 -> {12} [color=green];
subgraph cluster_9 {
color=red
29 [label="Enter function run" style="filled" fillcolor=red];
subgraph cluster_10 {
color=blue
30 [label="Enter block"];
31 [label="Function call: R|<local>/c|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
32 [label="Exit block"];
}
33 [label="Exit function run" style="filled" fillcolor=red];
}
29 -> {30};
30 -> {31};
31 -> {32};
32 -> {33};
28 -> {29};
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot
Vendored
+39 -53
View File
@@ -26,97 +26,83 @@ digraph inLocalClass_kt {
}
0 -> {1};
1 -> {2};
1 -> {14 12 17 19 25 31} [color=red];
1 -> {12 15 21 27} [color=red];
2 -> {3};
2 -> {19 31 8} [color=green];
2 -> {19 31 8} [style=dashed];
2 -> {15 27 8} [color=green];
2 -> {15 27 8} [style=dashed];
3 -> {4};
4 -> {5};
5 -> {6};
6 -> {7};
8 -> {9} [color=green];
9 -> {10} [style=dotted];
9 -> {14} [color=green];
9 -> {14} [style=dashed];
9 -> {12} [color=green];
9 -> {12} [style=dashed];
10 -> {11} [style=dotted];
10 -> {25} [color=green];
10 -> {25} [style=dashed];
10 -> {21} [color=green];
10 -> {21} [style=dashed];
subgraph cluster_3 {
color=red
12 [label="Enter function getter" style="filled" fillcolor=red];
13 [label="Exit function getter" style="filled" fillcolor=red];
12 [label="Enter property" style="filled" fillcolor=red];
13 [label="Access variable R|<local>/a|"];
14 [label="Exit property" style="filled" fillcolor=red];
}
12 -> {13};
13 -> {14};
14 -> {10} [color=green];
subgraph cluster_4 {
color=red
14 [label="Enter property" style="filled" fillcolor=red];
15 [label="Access variable R|<local>/a|"];
16 [label="Exit property" style="filled" fillcolor=red];
15 [label="Enter function <init>" style="filled" fillcolor=red];
16 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
subgraph cluster_5 {
color=blue
17 [label="Enter block"];
18 [label="Function call: R|<local>/b|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
19 [label="Exit block"];
}
20 [label="Exit function <init>" style="filled" fillcolor=red];
}
14 -> {15};
15 -> {16};
16 -> {10} [color=green];
subgraph cluster_5 {
color=red
17 [label="Enter function getter" style="filled" fillcolor=red];
18 [label="Exit function getter" style="filled" fillcolor=red];
}
16 -> {17};
17 -> {18};
18 -> {19};
19 -> {20};
subgraph cluster_6 {
color=red
19 [label="Enter function <init>" style="filled" fillcolor=red];
20 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
21 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_7 {
color=blue
21 [label="Enter block"];
22 [label="Function call: R|<local>/b|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
23 [label="Exit block"];
22 [label="Enter block"];
23 [label="Access variable R|<local>/c|"];
24 [label="Assignment: R|/LocalClass.leaked|"];
25 [label="Exit block"];
}
24 [label="Exit function <init>" style="filled" fillcolor=red];
26 [label="Exit init block" style="filled" fillcolor=red];
}
19 -> {20};
20 -> {21};
21 -> {22};
22 -> {23};
23 -> {24};
24 -> {25};
25 -> {26};
26 -> {11} [color=green];
subgraph cluster_8 {
color=red
25 [label="Enter init block" style="filled" fillcolor=red];
27 [label="Enter function run" style="filled" fillcolor=red];
subgraph cluster_9 {
color=blue
26 [label="Enter block"];
27 [label="Access variable R|<local>/c|"];
28 [label="Assignment: R|/LocalClass.leaked|"];
29 [label="Exit block"];
28 [label="Enter block"];
29 [label="Function call: R|<local>/d|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
30 [label="Exit block"];
}
30 [label="Exit init block" style="filled" fillcolor=red];
31 [label="Exit function run" style="filled" fillcolor=red];
}
25 -> {26};
26 -> {27};
27 -> {28};
28 -> {29};
29 -> {30};
30 -> {11} [color=green];
subgraph cluster_10 {
color=red
31 [label="Enter function run" style="filled" fillcolor=red];
subgraph cluster_11 {
color=blue
32 [label="Enter block"];
33 [label="Function call: R|<local>/d|.R|SubstitutionOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
34 [label="Exit block"];
}
35 [label="Exit function run" style="filled" fillcolor=red];
}
31 -> {32};
32 -> {33};
33 -> {34};
34 -> {35};
30 -> {31};
}
compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.dot
Vendored
+56 -63
View File
@@ -58,8 +58,8 @@ digraph plusAssignWithLambdaInRhs_kt {
}
16 -> {17} [color=green];
17 -> {18} [style=dotted];
17 -> {24} [color=green];
17 -> {24} [style=dashed];
17 -> {22} [color=green];
17 -> {22} [style=dashed];
subgraph cluster_5 {
color=red
@@ -72,97 +72,90 @@ digraph plusAssignWithLambdaInRhs_kt {
subgraph cluster_6 {
color=red
22 [label="Enter function getter" style="filled" fillcolor=red];
23 [label="Exit function getter" style="filled" fillcolor=red];
22 [label="Enter property" style="filled" fillcolor=red];
23 [label="Access variable R|<local>/executor|"];
24 [label="Exit property" style="filled" fillcolor=red];
}
22 -> {23};
23 -> {24};
24 -> {18} [color=green];
subgraph cluster_7 {
color=red
24 [label="Enter property" style="filled" fillcolor=red];
25 [label="Access variable R|<local>/executor|"];
26 [label="Exit property" style="filled" fillcolor=red];
}
24 -> {25};
25 -> {26};
26 -> {18} [color=green];
subgraph cluster_8 {
color=red
27 [label="Enter function postpone" style="filled" fillcolor=red];
subgraph cluster_9 {
25 [label="Enter function postpone" style="filled" fillcolor=red];
subgraph cluster_8 {
color=blue
28 [label="Enter block"];
29 [label="Function call: R|kotlin/collections/mutableListOf|<R|() -> kotlin/Unit|>()"];
30 [label="Variable declaration: lval queue: R|kotlin/collections/MutableList<kotlin/Function0<kotlin/Unit>>|"];
31 [label="Postponed enter to lambda"];
subgraph cluster_10 {
26 [label="Enter block"];
27 [label="Function call: R|kotlin/collections/mutableListOf|<R|() -> kotlin/Unit|>()"];
28 [label="Variable declaration: lval queue: R|kotlin/collections/MutableList<kotlin/Function0<kotlin/Unit>>|"];
29 [label="Postponed enter to lambda"];
subgraph cluster_9 {
color=blue
38 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_11 {
36 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_10 {
color=blue
39 [label="Enter block"];
40 [label="Access variable R|<local>/queue|"];
41 [label="Postponed enter to lambda"];
subgraph cluster_12 {
37 [label="Enter block"];
38 [label="Access variable R|<local>/queue|"];
39 [label="Postponed enter to lambda"];
subgraph cluster_11 {
color=blue
46 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_13 {
44 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_12 {
color=blue
47 [label="Enter block"];
48 [label="Function call: R|<local>/computation|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
49 [label="Function call: R|<local>/resolve|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(...)"];
50 [label="Exit block"];
45 [label="Enter block"];
46 [label="Function call: R|<local>/computation|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|()"];
47 [label="Function call: R|<local>/resolve|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(...)"];
48 [label="Exit block"];
}
51 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
49 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
}
42 [label="Postponed exit from lambda"];
43 [label="Function call: R|<local>/queue|.R|kotlin/collections/plusAssign|<R|() -> kotlin/Unit|>(...)"];
44 [label="Exit block"];
40 [label="Postponed exit from lambda"];
41 [label="Function call: R|<local>/queue|.R|kotlin/collections/plusAssign|<R|() -> kotlin/Unit|>(...)"];
42 [label="Exit block"];
}
45 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
43 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
}
32 [label="Postponed exit from lambda"];
33 [label="Function call: R|/A.A|<R|T|>(...)"];
34 [label="Jump: ^postpone R|/A.A|<R|T|>(<L> = A@fun <anonymous>(resolve: R|(T) -> kotlin/Unit|): R|kotlin/Unit| <inline=NoInline> {
30 [label="Postponed exit from lambda"];
31 [label="Function call: R|/A.A|<R|T|>(...)"];
32 [label="Jump: ^postpone R|/A.A|<R|T|>(<L> = A@fun <anonymous>(resolve: R|(T) -> kotlin/Unit|): R|kotlin/Unit| <inline=NoInline> {
R|<local>/queue|.R|kotlin/collections/plusAssign|<R|() -> kotlin/Unit|>(A@fun <anonymous>(): R|kotlin/Unit| <inline=Inline, kind=UNKNOWN> {
R|<local>/resolve|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(R|<local>/computation|.R|SubstitutionOverride<kotlin/Function0.invoke: R|T|>|())
}
)
}
)"];
35 [label="Stub" style="filled" fillcolor=gray];
36 [label="Exit block" style="filled" fillcolor=gray];
33 [label="Stub" style="filled" fillcolor=gray];
34 [label="Exit block" style="filled" fillcolor=gray];
}
37 [label="Exit function postpone" style="filled" fillcolor=red];
35 [label="Exit function postpone" style="filled" fillcolor=red];
}
25 -> {26};
26 -> {27};
27 -> {28};
28 -> {29};
29 -> {30};
29 -> {30 36};
29 -> {36} [style=dashed];
30 -> {31};
31 -> {32 38};
31 -> {38} [style=dashed];
32 -> {33};
33 -> {34};
34 -> {37};
31 -> {32};
32 -> {35};
32 -> {33} [style=dotted];
33 -> {34} [style=dotted];
34 -> {35} [style=dotted];
35 -> {36} [style=dotted];
36 -> {37} [style=dotted];
36 -> {37};
37 -> {38};
38 -> {39};
39 -> {40};
39 -> {44};
39 -> {40} [color=red];
39 -> {44} [style=dashed];
40 -> {41};
41 -> {46};
41 -> {42} [color=red];
41 -> {46} [style=dashed];
41 -> {42};
42 -> {43};
43 -> {44};
44 -> {45};
46 -> {51 47};
44 -> {49 45};
45 -> {46};
46 -> {47};
47 -> {48};
48 -> {49};
49 -> {50};
50 -> {51};
51 -> {42} [color=green];
51 -> {46} [color=green style=dashed];
49 -> {40} [color=green];
49 -> {44} [color=green style=dashed];
}