FIR: fix FirDefaultPropertyAccessor phase to BODY_RESOLVE

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
@@ -11,8 +11,8 @@ digraph assignSafeCall_kt {
}
0 -> {1} [color=green];
1 -> {2} [style=dotted];
1 -> {15} [color=green];
1 -> {15} [style=dashed];
1 -> {13} [color=green];
1 -> {13} [style=dashed];
subgraph cluster_1 {
color=red
@@ -46,76 +46,71 @@ digraph assignSafeCall_kt {
subgraph cluster_4 {
color=red
13 [label="Enter function getter" style="filled" fillcolor=red];
14 [label="Exit function getter" style="filled" fillcolor=red];
13 [label="Enter property" style="filled" fillcolor=red];
14 [label="Const: Int(1)"];
15 [label="Exit property" style="filled" fillcolor=red];
}
13 -> {14};
14 -> {15};
15 -> {2} [color=green];
subgraph cluster_5 {
color=red
15 [label="Enter property" style="filled" fillcolor=red];
16 [label="Const: Int(1)"];
17 [label="Exit property" style="filled" fillcolor=red];
}
15 -> {16};
16 -> {17};
17 -> {2} [color=green];
subgraph cluster_6 {
color=red
18 [label="Enter function bar" style="filled" fillcolor=red];
subgraph cluster_7 {
16 [label="Enter function bar" style="filled" fillcolor=red];
subgraph cluster_6 {
color=blue
19 [label="Enter block"];
20 [label="Exit block"];
17 [label="Enter block"];
18 [label="Exit block"];
}
21 [label="Exit function bar" style="filled" fillcolor=red];
19 [label="Exit function bar" style="filled" fillcolor=red];
}
16 -> {17};
17 -> {18};
18 -> {19};
19 -> {20};
20 -> {21};
subgraph cluster_8 {
subgraph cluster_7 {
color=red
22 [label="Enter function test_1" style="filled" fillcolor=red];
subgraph cluster_9 {
20 [label="Enter function test_1" style="filled" fillcolor=red];
subgraph cluster_8 {
color=blue
23 [label="Enter block"];
24 [label="Access variable R|<local>/a|"];
25 [label="Enter safe call"];
26 [label="Access variable R|/A.x|"];
27 [label="Exit safe call"];
28 [label="Variable declaration: lval x: R|kotlin/Int?|"];
subgraph cluster_10 {
21 [label="Enter block"];
22 [label="Access variable R|<local>/a|"];
23 [label="Enter safe call"];
24 [label="Access variable R|/A.x|"];
25 [label="Exit safe call"];
26 [label="Variable declaration: lval x: R|kotlin/Int?|"];
subgraph cluster_9 {
color=blue
29 [label="Enter when"];
27 [label="Enter when"];
subgraph cluster_10 {
color=blue
28 [label="Enter when branch condition "];
29 [label="Access variable R|<local>/x|"];
30 [label="Const: Null(null)"];
31 [label="Equality operator !="];
32 [label="Exit when branch condition"];
}
33 [label="Synthetic else branch"];
34 [label="Enter when branch result"];
subgraph cluster_11 {
color=blue
30 [label="Enter when branch condition "];
31 [label="Access variable R|<local>/x|"];
32 [label="Const: Null(null)"];
33 [label="Equality operator !="];
34 [label="Exit when branch condition"];
35 [label="Enter block"];
36 [label="Access variable R|<local>/a|"];
37 [label="Function call: R|<local>/a|.R|/A.bar|()"];
38 [label="Exit block"];
}
35 [label="Synthetic else branch"];
36 [label="Enter when branch result"];
subgraph cluster_12 {
color=blue
37 [label="Enter block"];
38 [label="Access variable R|<local>/a|"];
39 [label="Function call: R|<local>/a|.R|/A.bar|()"];
40 [label="Exit block"];
}
41 [label="Exit when branch result"];
42 [label="Exit when"];
39 [label="Exit when branch result"];
40 [label="Exit when"];
}
43 [label="Exit block"];
41 [label="Exit block"];
}
44 [label="Exit function test_1" style="filled" fillcolor=red];
42 [label="Exit function test_1" style="filled" fillcolor=red];
}
22 -> {23};
20 -> {21};
21 -> {22};
22 -> {23 25};
23 -> {24};
24 -> {25 27};
24 -> {25};
25 -> {26};
26 -> {27};
27 -> {28};
@@ -123,60 +118,60 @@ digraph assignSafeCall_kt {
29 -> {30};
30 -> {31};
31 -> {32};
32 -> {33};
33 -> {34};
34 -> {36 35};
35 -> {42};
32 -> {34 33};
33 -> {40};
34 -> {35};
35 -> {36};
36 -> {37};
37 -> {38};
38 -> {39};
39 -> {40};
40 -> {41};
41 -> {42};
42 -> {43};
43 -> {44};
subgraph cluster_13 {
subgraph cluster_12 {
color=red
45 [label="Enter function test_2" style="filled" fillcolor=red];
subgraph cluster_14 {
43 [label="Enter function test_2" style="filled" fillcolor=red];
subgraph cluster_13 {
color=blue
46 [label="Enter block"];
47 [label="Access variable R|<local>/a|"];
48 [label="Enter safe call"];
49 [label="Function call: $subj$.R|/A.foo|()"];
50 [label="Exit safe call"];
51 [label="Variable declaration: lval x: R|kotlin/Int?|"];
subgraph cluster_15 {
44 [label="Enter block"];
45 [label="Access variable R|<local>/a|"];
46 [label="Enter safe call"];
47 [label="Function call: $subj$.R|/A.foo|()"];
48 [label="Exit safe call"];
49 [label="Variable declaration: lval x: R|kotlin/Int?|"];
subgraph cluster_14 {
color=blue
52 [label="Enter when"];
50 [label="Enter when"];
subgraph cluster_15 {
color=blue
51 [label="Enter when branch condition "];
52 [label="Access variable R|<local>/x|"];
53 [label="Const: Null(null)"];
54 [label="Equality operator !="];
55 [label="Exit when branch condition"];
}
56 [label="Synthetic else branch"];
57 [label="Enter when branch result"];
subgraph cluster_16 {
color=blue
53 [label="Enter when branch condition "];
54 [label="Access variable R|<local>/x|"];
55 [label="Const: Null(null)"];
56 [label="Equality operator !="];
57 [label="Exit when branch condition"];
58 [label="Enter block"];
59 [label="Access variable R|<local>/a|"];
60 [label="Function call: R|<local>/a|.R|/A.bar|()"];
61 [label="Exit block"];
}
58 [label="Synthetic else branch"];
59 [label="Enter when branch result"];
subgraph cluster_17 {
color=blue
60 [label="Enter block"];
61 [label="Access variable R|<local>/a|"];
62 [label="Function call: R|<local>/a|.R|/A.bar|()"];
63 [label="Exit block"];
}
64 [label="Exit when branch result"];
65 [label="Exit when"];
62 [label="Exit when branch result"];
63 [label="Exit when"];
}
66 [label="Exit block"];
64 [label="Exit block"];
}
67 [label="Exit function test_2" style="filled" fillcolor=red];
65 [label="Exit function test_2" style="filled" fillcolor=red];
}
45 -> {46};
43 -> {44};
44 -> {45};
45 -> {46 48};
46 -> {47};
47 -> {48 50};
47 -> {48};
48 -> {49};
49 -> {50};
50 -> {51};
@@ -184,249 +179,240 @@ digraph assignSafeCall_kt {
52 -> {53};
53 -> {54};
54 -> {55};
55 -> {56};
56 -> {57};
57 -> {59 58};
58 -> {65};
55 -> {57 56};
56 -> {63};
57 -> {58};
58 -> {59};
59 -> {60};
60 -> {61};
61 -> {62};
62 -> {63};
63 -> {64};
64 -> {65};
65 -> {66};
66 -> {67};
subgraph cluster_18 {
subgraph cluster_17 {
color=red
68 [label="Enter function test_3" style="filled" fillcolor=red];
subgraph cluster_19 {
66 [label="Enter function test_3" style="filled" fillcolor=red];
subgraph cluster_18 {
color=blue
69 [label="Enter block"];
70 [label="Access variable R|<local>/x|"];
71 [label="Type operator: (R|<local>/x| as? R|A|)"];
72 [label="Exit lhs of ?:"];
73 [label="Enter rhs of ?:"];
74 [label="Jump: ^test_3 Unit"];
75 [label="Stub" style="filled" fillcolor=gray];
76 [label="Lhs of ?: is not null"];
77 [label="Exit ?:"];
78 [label="Variable declaration: lval a: R|A|"];
79 [label="Access variable R|<local>/a|"];
80 [label="Function call: R|<local>/a|.R|/A.foo|()"];
81 [label="Access variable R|<local>/x|"];
82 [label="Function call: R|<local>/x|.R|/A.foo|()"];
83 [label="Exit block"];
67 [label="Enter block"];
68 [label="Access variable R|<local>/x|"];
69 [label="Type operator: (R|<local>/x| as? R|A|)"];
70 [label="Exit lhs of ?:"];
71 [label="Enter rhs of ?:"];
72 [label="Jump: ^test_3 Unit"];
73 [label="Stub" style="filled" fillcolor=gray];
74 [label="Lhs of ?: is not null"];
75 [label="Exit ?:"];
76 [label="Variable declaration: lval a: R|A|"];
77 [label="Access variable R|<local>/a|"];
78 [label="Function call: R|<local>/a|.R|/A.foo|()"];
79 [label="Access variable R|<local>/x|"];
80 [label="Function call: R|<local>/x|.R|/A.foo|()"];
81 [label="Exit block"];
}
84 [label="Exit function test_3" style="filled" fillcolor=red];
82 [label="Exit function test_3" style="filled" fillcolor=red];
}
66 -> {67};
67 -> {68};
68 -> {69};
69 -> {70};
70 -> {71};
70 -> {74 71};
71 -> {72};
72 -> {76 73};
73 -> {74};
74 -> {84};
74 -> {75} [style=dotted];
75 -> {77} [style=dotted];
72 -> {82};
72 -> {73} [style=dotted];
73 -> {75} [style=dotted];
74 -> {75};
75 -> {76};
76 -> {77};
77 -> {78};
78 -> {79};
79 -> {80};
80 -> {81};
81 -> {82};
82 -> {83};
83 -> {84};
subgraph cluster_19 {
color=red
83 [label="Enter class B" style="filled" fillcolor=red];
84 [label="Exit class B" style="filled" fillcolor=red];
}
83 -> {84} [color=green];
subgraph cluster_20 {
color=red
85 [label="Enter class B" style="filled" fillcolor=red];
86 [label="Exit class B" style="filled" fillcolor=red];
85 [label="Enter function foo" style="filled" fillcolor=red];
86 [label="Exit function foo" style="filled" fillcolor=red];
}
85 -> {86} [color=green];
85 -> {86};
subgraph cluster_21 {
color=red
87 [label="Enter function foo" style="filled" fillcolor=red];
88 [label="Exit function foo" style="filled" fillcolor=red];
87 [label="Enter function bar" style="filled" fillcolor=red];
88 [label="Exit function bar" style="filled" fillcolor=red];
}
87 -> {88};
subgraph cluster_22 {
color=red
89 [label="Enter function getter" style="filled" fillcolor=red];
90 [label="Exit function getter" style="filled" fillcolor=red];
89 [label="Enter function test_1" style="filled" fillcolor=red];
subgraph cluster_23 {
color=blue
90 [label="Enter block"];
91 [label="Access variable R|<local>/a|"];
92 [label="Enter safe call"];
93 [label="Access variable R|/B.x|"];
94 [label="Exit safe call"];
95 [label="Variable declaration: lval x: R|kotlin/Int?|"];
subgraph cluster_24 {
color=blue
96 [label="Enter when"];
subgraph cluster_25 {
color=blue
97 [label="Enter when branch condition "];
98 [label="Access variable R|<local>/x|"];
99 [label="Const: Null(null)"];
100 [label="Equality operator !="];
101 [label="Exit when branch condition"];
}
102 [label="Synthetic else branch"];
103 [label="Enter when branch result"];
subgraph cluster_26 {
color=blue
104 [label="Enter block"];
105 [label="Access variable R|<local>/a|"];
106 [label="Function call: R|<local>/a|.R|/B.bar|()"];
107 [label="Exit block"];
}
108 [label="Exit when branch result"];
109 [label="Exit when"];
}
110 [label="Exit block"];
}
111 [label="Exit function test_1" style="filled" fillcolor=red];
}
89 -> {90};
subgraph cluster_23 {
color=red
91 [label="Enter function bar" style="filled" fillcolor=red];
92 [label="Exit function bar" style="filled" fillcolor=red];
}
91 -> {92};
subgraph cluster_24 {
color=red
93 [label="Enter function test_1" style="filled" fillcolor=red];
subgraph cluster_25 {
color=blue
94 [label="Enter block"];
95 [label="Access variable R|<local>/a|"];
96 [label="Enter safe call"];
97 [label="Access variable R|/B.x|"];
98 [label="Exit safe call"];
99 [label="Variable declaration: lval x: R|kotlin/Int?|"];
subgraph cluster_26 {
color=blue
100 [label="Enter when"];
subgraph cluster_27 {
color=blue
101 [label="Enter when branch condition "];
102 [label="Access variable R|<local>/x|"];
103 [label="Const: Null(null)"];
104 [label="Equality operator !="];
105 [label="Exit when branch condition"];
}
106 [label="Synthetic else branch"];
107 [label="Enter when branch result"];
subgraph cluster_28 {
color=blue
108 [label="Enter block"];
109 [label="Access variable R|<local>/a|"];
110 [label="Function call: R|<local>/a|.R|/B.bar|()"];
111 [label="Exit block"];
}
112 [label="Exit when branch result"];
113 [label="Exit when"];
}
114 [label="Exit block"];
}
115 [label="Exit function test_1" style="filled" fillcolor=red];
}
90 -> {91};
91 -> {92 94};
92 -> {93};
93 -> {94};
94 -> {95};
95 -> {96 98};
95 -> {96};
96 -> {97};
97 -> {98};
98 -> {99};
99 -> {100};
100 -> {101};
101 -> {102};
102 -> {103};
101 -> {103 102};
102 -> {109};
103 -> {104};
104 -> {105};
105 -> {107 106};
106 -> {113};
105 -> {106};
106 -> {107};
107 -> {108};
108 -> {109};
109 -> {110};
110 -> {111};
111 -> {112};
subgraph cluster_27 {
color=red
112 [label="Enter function test_2" style="filled" fillcolor=red];
subgraph cluster_28 {
color=blue
113 [label="Enter block"];
114 [label="Access variable R|<local>/a|"];
115 [label="Enter safe call"];
116 [label="Function call: $subj$.R|/B.foo|()"];
117 [label="Exit safe call"];
118 [label="Variable declaration: lval x: R|kotlin/Int?|"];
subgraph cluster_29 {
color=blue
119 [label="Enter when"];
subgraph cluster_30 {
color=blue
120 [label="Enter when branch condition "];
121 [label="Access variable R|<local>/x|"];
122 [label="Const: Null(null)"];
123 [label="Equality operator !="];
124 [label="Exit when branch condition"];
}
125 [label="Synthetic else branch"];
126 [label="Enter when branch result"];
subgraph cluster_31 {
color=blue
127 [label="Enter block"];
128 [label="Access variable R|<local>/a|"];
129 [label="Function call: R|<local>/a|.R|/B.bar|()"];
130 [label="Exit block"];
}
131 [label="Exit when branch result"];
132 [label="Exit when"];
}
133 [label="Exit block"];
}
134 [label="Exit function test_2" style="filled" fillcolor=red];
}
112 -> {113};
113 -> {114};
114 -> {115};
subgraph cluster_29 {
color=red
116 [label="Enter function test_2" style="filled" fillcolor=red];
subgraph cluster_30 {
color=blue
117 [label="Enter block"];
118 [label="Access variable R|<local>/a|"];
119 [label="Enter safe call"];
120 [label="Function call: $subj$.R|/B.foo|()"];
121 [label="Exit safe call"];
122 [label="Variable declaration: lval x: R|kotlin/Int?|"];
subgraph cluster_31 {
color=blue
123 [label="Enter when"];
subgraph cluster_32 {
color=blue
124 [label="Enter when branch condition "];
125 [label="Access variable R|<local>/x|"];
126 [label="Const: Null(null)"];
127 [label="Equality operator !="];
128 [label="Exit when branch condition"];
}
129 [label="Synthetic else branch"];
130 [label="Enter when branch result"];
subgraph cluster_33 {
color=blue
131 [label="Enter block"];
132 [label="Access variable R|<local>/a|"];
133 [label="Function call: R|<local>/a|.R|/B.bar|()"];
134 [label="Exit block"];
}
135 [label="Exit when branch result"];
136 [label="Exit when"];
}
137 [label="Exit block"];
}
138 [label="Exit function test_2" style="filled" fillcolor=red];
}
114 -> {115 117};
115 -> {116};
116 -> {117};
117 -> {118};
118 -> {119 121};
118 -> {119};
119 -> {120};
120 -> {121};
121 -> {122};
122 -> {123};
123 -> {124};
124 -> {125};
125 -> {126};
124 -> {126 125};
125 -> {132};
126 -> {127};
127 -> {128};
128 -> {130 129};
129 -> {136};
128 -> {129};
129 -> {130};
130 -> {131};
131 -> {132};
132 -> {133};
133 -> {134};
134 -> {135};
subgraph cluster_32 {
color=red
135 [label="Enter function test_3" style="filled" fillcolor=red];
subgraph cluster_33 {
color=blue
136 [label="Enter block"];
137 [label="Access variable R|<local>/x|"];
138 [label="Type operator: (R|<local>/x| as? R|B|)"];
139 [label="Exit lhs of ?:"];
140 [label="Enter rhs of ?:"];
141 [label="Jump: ^test_3 Unit"];
142 [label="Stub" style="filled" fillcolor=gray];
143 [label="Lhs of ?: is not null"];
144 [label="Exit ?:"];
145 [label="Variable declaration: lval a: R|B|"];
146 [label="Access variable R|<local>/a|"];
147 [label="Function call: R|<local>/a|.R|/B.foo|()"];
148 [label="Access variable R|<local>/x|"];
149 [label="Function call: R|<local>/x|.R|/B.foo|()"];
150 [label="Exit block"];
}
151 [label="Exit function test_3" style="filled" fillcolor=red];
}
135 -> {136};
136 -> {137};
137 -> {138};
subgraph cluster_34 {
color=red
139 [label="Enter function test_3" style="filled" fillcolor=red];
subgraph cluster_35 {
color=blue
140 [label="Enter block"];
141 [label="Access variable R|<local>/x|"];
142 [label="Type operator: (R|<local>/x| as? R|B|)"];
143 [label="Exit lhs of ?:"];
144 [label="Enter rhs of ?:"];
145 [label="Jump: ^test_3 Unit"];
146 [label="Stub" style="filled" fillcolor=gray];
147 [label="Lhs of ?: is not null"];
148 [label="Exit ?:"];
149 [label="Variable declaration: lval a: R|B|"];
150 [label="Access variable R|<local>/a|"];
151 [label="Function call: R|<local>/a|.R|/B.foo|()"];
152 [label="Access variable R|<local>/x|"];
153 [label="Function call: R|<local>/x|.R|/B.foo|()"];
154 [label="Exit block"];
}
155 [label="Exit function test_3" style="filled" fillcolor=red];
}
139 -> {140};
138 -> {139};
139 -> {143 140};
140 -> {141};
141 -> {142};
142 -> {143};
143 -> {147 144};
141 -> {151};
141 -> {142} [style=dotted];
142 -> {144} [style=dotted];
143 -> {144};
144 -> {145};
145 -> {155};
145 -> {146} [style=dotted];
146 -> {148} [style=dotted];
145 -> {146};
146 -> {147};
147 -> {148};
148 -> {149};
149 -> {150};
150 -> {151};
151 -> {152};
152 -> {153};
153 -> {154};
154 -> {155};
}