FIR: fix FirDefaultPropertyAccessor phase to BODY_RESOLVE
This commit is contained in:
Ilya Kirillov
committed by
TeamCityServer
TeamCityServer
parent
39b2cd1027
commit
0cf00d0f72
Vendored
+94
-101
@@ -322,8 +322,8 @@ digraph boundSmartcasts_kt {
|
||||
}
|
||||
115 -> {116} [color=green];
|
||||
116 -> {117} [style=dotted];
|
||||
116 -> {123} [color=green];
|
||||
116 -> {123} [style=dashed];
|
||||
116 -> {121} [color=green];
|
||||
116 -> {121} [style=dashed];
|
||||
|
||||
subgraph cluster_28 {
|
||||
color=red
|
||||
@@ -336,72 +336,67 @@ digraph boundSmartcasts_kt {
|
||||
|
||||
subgraph cluster_29 {
|
||||
color=red
|
||||
121 [label="Enter function getter" style="filled" fillcolor=red];
|
||||
122 [label="Exit function getter" style="filled" fillcolor=red];
|
||||
121 [label="Enter property" style="filled" fillcolor=red];
|
||||
122 [label="Access variable R|<local>/any|"];
|
||||
123 [label="Exit property" style="filled" fillcolor=red];
|
||||
}
|
||||
121 -> {122};
|
||||
122 -> {123};
|
||||
123 -> {117} [color=green];
|
||||
|
||||
subgraph cluster_30 {
|
||||
color=red
|
||||
123 [label="Enter property" style="filled" fillcolor=red];
|
||||
124 [label="Access variable R|<local>/any|"];
|
||||
125 [label="Exit property" style="filled" fillcolor=red];
|
||||
124 [label="Enter function baz" style="filled" fillcolor=red];
|
||||
subgraph cluster_31 {
|
||||
color=blue
|
||||
125 [label="Enter block"];
|
||||
126 [label="Exit block"];
|
||||
}
|
||||
127 [label="Exit function baz" style="filled" fillcolor=red];
|
||||
}
|
||||
123 -> {124};
|
||||
124 -> {125};
|
||||
125 -> {117} [color=green];
|
||||
|
||||
subgraph cluster_31 {
|
||||
color=red
|
||||
126 [label="Enter function baz" style="filled" fillcolor=red];
|
||||
subgraph cluster_32 {
|
||||
color=blue
|
||||
127 [label="Enter block"];
|
||||
128 [label="Exit block"];
|
||||
}
|
||||
129 [label="Exit function baz" style="filled" fillcolor=red];
|
||||
}
|
||||
125 -> {126};
|
||||
126 -> {127};
|
||||
127 -> {128};
|
||||
128 -> {129};
|
||||
|
||||
subgraph cluster_33 {
|
||||
subgraph cluster_32 {
|
||||
color=red
|
||||
130 [label="Enter function test_5" style="filled" fillcolor=red];
|
||||
subgraph cluster_34 {
|
||||
128 [label="Enter function test_5" style="filled" fillcolor=red];
|
||||
subgraph cluster_33 {
|
||||
color=blue
|
||||
131 [label="Enter block"];
|
||||
132 [label="Access variable R|<local>/d|"];
|
||||
133 [label="Access variable R|/D.any|"];
|
||||
134 [label="Exit lhs of ?:"];
|
||||
135 [label="Enter rhs of ?:"];
|
||||
136 [label="Jump: ^test_5 Unit"];
|
||||
137 [label="Stub" style="filled" fillcolor=gray];
|
||||
138 [label="Lhs of ?: is not null"];
|
||||
139 [label="Exit ?:"];
|
||||
140 [label="Variable declaration: lval a: R|kotlin/Any|"];
|
||||
141 [label="Access variable R|<local>/a|"];
|
||||
142 [label="Function call: R|<local>/a|.R|/baz|()"];
|
||||
143 [label="Access variable R|<local>/d|"];
|
||||
144 [label="Access variable R|/D.any|"];
|
||||
145 [label="Function call: R|<local>/d|.R|/D.any|.R|/baz|()"];
|
||||
129 [label="Enter block"];
|
||||
130 [label="Access variable R|<local>/d|"];
|
||||
131 [label="Access variable R|/D.any|"];
|
||||
132 [label="Exit lhs of ?:"];
|
||||
133 [label="Enter rhs of ?:"];
|
||||
134 [label="Jump: ^test_5 Unit"];
|
||||
135 [label="Stub" style="filled" fillcolor=gray];
|
||||
136 [label="Lhs of ?: is not null"];
|
||||
137 [label="Exit ?:"];
|
||||
138 [label="Variable declaration: lval a: R|kotlin/Any|"];
|
||||
139 [label="Access variable R|<local>/a|"];
|
||||
140 [label="Function call: R|<local>/a|.R|/baz|()"];
|
||||
141 [label="Access variable R|<local>/d|"];
|
||||
142 [label="Access variable R|/D.any|"];
|
||||
143 [label="Function call: R|<local>/d|.R|/D.any|.R|/baz|()"];
|
||||
144 [label="Access variable R|<local>/a|"];
|
||||
145 [label="Type operator: (R|<local>/a| as R|A|)"];
|
||||
146 [label="Access variable R|<local>/a|"];
|
||||
147 [label="Type operator: (R|<local>/a| as R|A|)"];
|
||||
148 [label="Access variable R|<local>/a|"];
|
||||
149 [label="Function call: R|<local>/a|.R|/A.foo|()"];
|
||||
150 [label="Exit block"];
|
||||
147 [label="Function call: R|<local>/a|.R|/A.foo|()"];
|
||||
148 [label="Exit block"];
|
||||
}
|
||||
151 [label="Exit function test_5" style="filled" fillcolor=red];
|
||||
149 [label="Exit function test_5" style="filled" fillcolor=red];
|
||||
}
|
||||
128 -> {129};
|
||||
129 -> {130};
|
||||
130 -> {131};
|
||||
131 -> {132};
|
||||
132 -> {133};
|
||||
132 -> {136 133};
|
||||
133 -> {134};
|
||||
134 -> {138 135};
|
||||
135 -> {136};
|
||||
136 -> {151};
|
||||
136 -> {137} [style=dotted];
|
||||
137 -> {139} [style=dotted];
|
||||
134 -> {149};
|
||||
134 -> {135} [style=dotted];
|
||||
135 -> {137} [style=dotted];
|
||||
136 -> {137};
|
||||
137 -> {138};
|
||||
138 -> {139};
|
||||
139 -> {140};
|
||||
140 -> {141};
|
||||
@@ -413,32 +408,32 @@ digraph boundSmartcasts_kt {
|
||||
146 -> {147};
|
||||
147 -> {148};
|
||||
148 -> {149};
|
||||
149 -> {150};
|
||||
150 -> {151};
|
||||
|
||||
subgraph cluster_35 {
|
||||
subgraph cluster_34 {
|
||||
color=red
|
||||
152 [label="Enter function test_6" style="filled" fillcolor=red];
|
||||
subgraph cluster_36 {
|
||||
150 [label="Enter function test_6" style="filled" fillcolor=red];
|
||||
subgraph cluster_35 {
|
||||
color=blue
|
||||
153 [label="Enter block"];
|
||||
154 [label="Access variable R|<local>/d1|"];
|
||||
155 [label="Access variable R|/D.any|"];
|
||||
156 [label="Variable declaration: lval a: R|kotlin/Any?|"];
|
||||
151 [label="Enter block"];
|
||||
152 [label="Access variable R|<local>/d1|"];
|
||||
153 [label="Access variable R|/D.any|"];
|
||||
154 [label="Variable declaration: lval a: R|kotlin/Any?|"];
|
||||
155 [label="Access variable R|<local>/a|"];
|
||||
156 [label="Type operator: (R|<local>/a| as R|A|)"];
|
||||
157 [label="Access variable R|<local>/a|"];
|
||||
158 [label="Type operator: (R|<local>/a| as R|A|)"];
|
||||
159 [label="Access variable R|<local>/a|"];
|
||||
160 [label="Function call: R|<local>/a|.R|/A.foo|()"];
|
||||
161 [label="Access variable R|<local>/d1|"];
|
||||
162 [label="Access variable R|/D.any|"];
|
||||
163 [label="Function call: R|<local>/d1|.R|/D.any|.R|/A.foo|()"];
|
||||
164 [label="Access variable R|<local>/d1|"];
|
||||
165 [label="Access variable R|/D.any|"];
|
||||
166 [label="Function call: R|<local>/d1|.R|/D.any|.R|/baz|()"];
|
||||
167 [label="Exit block"];
|
||||
158 [label="Function call: R|<local>/a|.R|/A.foo|()"];
|
||||
159 [label="Access variable R|<local>/d1|"];
|
||||
160 [label="Access variable R|/D.any|"];
|
||||
161 [label="Function call: R|<local>/d1|.R|/D.any|.R|/A.foo|()"];
|
||||
162 [label="Access variable R|<local>/d1|"];
|
||||
163 [label="Access variable R|/D.any|"];
|
||||
164 [label="Function call: R|<local>/d1|.R|/D.any|.R|/baz|()"];
|
||||
165 [label="Exit block"];
|
||||
}
|
||||
168 [label="Exit function test_6" style="filled" fillcolor=red];
|
||||
166 [label="Exit function test_6" style="filled" fillcolor=red];
|
||||
}
|
||||
150 -> {151};
|
||||
151 -> {152};
|
||||
152 -> {153};
|
||||
153 -> {154};
|
||||
154 -> {155};
|
||||
@@ -453,45 +448,45 @@ digraph boundSmartcasts_kt {
|
||||
163 -> {164};
|
||||
164 -> {165};
|
||||
165 -> {166};
|
||||
166 -> {167};
|
||||
167 -> {168};
|
||||
|
||||
subgraph cluster_37 {
|
||||
subgraph cluster_36 {
|
||||
color=red
|
||||
169 [label="Enter function test_7" style="filled" fillcolor=red];
|
||||
subgraph cluster_38 {
|
||||
167 [label="Enter function test_7" style="filled" fillcolor=red];
|
||||
subgraph cluster_37 {
|
||||
color=blue
|
||||
170 [label="Enter block"];
|
||||
171 [label="Access variable R|<local>/d1|"];
|
||||
172 [label="Enter safe call"];
|
||||
173 [label="Access variable R|/D.any|"];
|
||||
174 [label="Exit safe call"];
|
||||
175 [label="Variable declaration: lval a: R|kotlin/Any?|"];
|
||||
176 [label="Access variable R|<local>/d2|"];
|
||||
177 [label="Enter safe call"];
|
||||
178 [label="Access variable R|/D.any|"];
|
||||
179 [label="Exit safe call"];
|
||||
180 [label="Variable declaration: lval b: R|kotlin/Any?|"];
|
||||
168 [label="Enter block"];
|
||||
169 [label="Access variable R|<local>/d1|"];
|
||||
170 [label="Enter safe call"];
|
||||
171 [label="Access variable R|/D.any|"];
|
||||
172 [label="Exit safe call"];
|
||||
173 [label="Variable declaration: lval a: R|kotlin/Any?|"];
|
||||
174 [label="Access variable R|<local>/d2|"];
|
||||
175 [label="Enter safe call"];
|
||||
176 [label="Access variable R|/D.any|"];
|
||||
177 [label="Exit safe call"];
|
||||
178 [label="Variable declaration: lval b: R|kotlin/Any?|"];
|
||||
179 [label="Access variable R|<local>/a|"];
|
||||
180 [label="Type operator: (R|<local>/a| as R|A|)"];
|
||||
181 [label="Access variable R|<local>/a|"];
|
||||
182 [label="Type operator: (R|<local>/a| as R|A|)"];
|
||||
183 [label="Access variable R|<local>/a|"];
|
||||
184 [label="Function call: R|<local>/a|.R|/A.foo|()"];
|
||||
182 [label="Function call: R|<local>/a|.R|/A.foo|()"];
|
||||
183 [label="Access variable R|<local>/b|"];
|
||||
184 [label="Type operator: (R|<local>/b| as R|B|)"];
|
||||
185 [label="Access variable R|<local>/b|"];
|
||||
186 [label="Type operator: (R|<local>/b| as R|B|)"];
|
||||
187 [label="Access variable R|<local>/b|"];
|
||||
188 [label="Function call: R|<local>/b|.R|/B.bar|()"];
|
||||
189 [label="Exit block"];
|
||||
186 [label="Function call: R|<local>/b|.R|/B.bar|()"];
|
||||
187 [label="Exit block"];
|
||||
}
|
||||
190 [label="Exit function test_7" style="filled" fillcolor=red];
|
||||
188 [label="Exit function test_7" style="filled" fillcolor=red];
|
||||
}
|
||||
169 -> {170};
|
||||
167 -> {168};
|
||||
168 -> {169};
|
||||
169 -> {170 172};
|
||||
170 -> {171};
|
||||
171 -> {172 174};
|
||||
171 -> {172};
|
||||
172 -> {173};
|
||||
173 -> {174};
|
||||
174 -> {175};
|
||||
174 -> {175 177};
|
||||
175 -> {176};
|
||||
176 -> {177 179};
|
||||
176 -> {177};
|
||||
177 -> {178};
|
||||
178 -> {179};
|
||||
179 -> {180};
|
||||
@@ -503,7 +498,5 @@ digraph boundSmartcasts_kt {
|
||||
185 -> {186};
|
||||
186 -> {187};
|
||||
187 -> {188};
|
||||
188 -> {189};
|
||||
189 -> {190};
|
||||
|
||||
}
|
||||
|
||||
+445
-452
File diff suppressed because it is too large
Load Diff
Vendored
+66
-73
@@ -27,8 +27,8 @@ digraph functionCallBound_kt {
|
||||
}
|
||||
5 -> {6} [color=green];
|
||||
6 -> {7} [style=dotted];
|
||||
6 -> {13} [color=green];
|
||||
6 -> {13} [style=dashed];
|
||||
6 -> {11} [color=green];
|
||||
6 -> {11} [style=dashed];
|
||||
|
||||
subgraph cluster_3 {
|
||||
color=red
|
||||
@@ -41,88 +41,81 @@ digraph functionCallBound_kt {
|
||||
|
||||
subgraph cluster_4 {
|
||||
color=red
|
||||
11 [label="Enter function getter" style="filled" fillcolor=red];
|
||||
12 [label="Exit function getter" style="filled" fillcolor=red];
|
||||
11 [label="Enter property" style="filled" fillcolor=red];
|
||||
12 [label="Access variable R|<local>/data|"];
|
||||
13 [label="Exit property" style="filled" fillcolor=red];
|
||||
}
|
||||
11 -> {12};
|
||||
12 -> {13};
|
||||
13 -> {7} [color=green];
|
||||
|
||||
subgraph cluster_5 {
|
||||
color=red
|
||||
13 [label="Enter property" style="filled" fillcolor=red];
|
||||
14 [label="Access variable R|<local>/data|"];
|
||||
15 [label="Exit property" style="filled" fillcolor=red];
|
||||
}
|
||||
13 -> {14};
|
||||
14 -> {15};
|
||||
15 -> {7} [color=green];
|
||||
|
||||
subgraph cluster_6 {
|
||||
color=red
|
||||
16 [label="Enter function isOk" style="filled" fillcolor=red];
|
||||
subgraph cluster_7 {
|
||||
14 [label="Enter function isOk" style="filled" fillcolor=red];
|
||||
subgraph cluster_6 {
|
||||
color=blue
|
||||
17 [label="Enter block"];
|
||||
18 [label="Const: Boolean(true)"];
|
||||
19 [label="Jump: ^isOk Boolean(true)"];
|
||||
20 [label="Stub" style="filled" fillcolor=gray];
|
||||
21 [label="Exit block" style="filled" fillcolor=gray];
|
||||
15 [label="Enter block"];
|
||||
16 [label="Const: Boolean(true)"];
|
||||
17 [label="Jump: ^isOk Boolean(true)"];
|
||||
18 [label="Stub" style="filled" fillcolor=gray];
|
||||
19 [label="Exit block" style="filled" fillcolor=gray];
|
||||
}
|
||||
22 [label="Exit function isOk" style="filled" fillcolor=red];
|
||||
20 [label="Exit function isOk" style="filled" fillcolor=red];
|
||||
}
|
||||
14 -> {15};
|
||||
15 -> {16};
|
||||
16 -> {17};
|
||||
17 -> {18};
|
||||
18 -> {19};
|
||||
19 -> {22};
|
||||
17 -> {20};
|
||||
17 -> {18} [style=dotted];
|
||||
18 -> {19} [style=dotted];
|
||||
19 -> {20} [style=dotted];
|
||||
20 -> {21} [style=dotted];
|
||||
21 -> {22} [style=dotted];
|
||||
|
||||
subgraph cluster_8 {
|
||||
subgraph cluster_7 {
|
||||
color=red
|
||||
23 [label="Enter function check" style="filled" fillcolor=red];
|
||||
subgraph cluster_9 {
|
||||
21 [label="Enter function check" style="filled" fillcolor=red];
|
||||
subgraph cluster_8 {
|
||||
color=blue
|
||||
24 [label="Enter block"];
|
||||
subgraph cluster_10 {
|
||||
22 [label="Enter block"];
|
||||
subgraph cluster_9 {
|
||||
color=blue
|
||||
25 [label="Enter when"];
|
||||
23 [label="Enter when"];
|
||||
subgraph cluster_10 {
|
||||
color=blue
|
||||
24 [label="Enter when branch condition "];
|
||||
25 [label="Access variable R|<local>/base|"];
|
||||
26 [label="Type operator: (R|<local>/base| as? R|Sub|)"];
|
||||
27 [label="Enter safe call"];
|
||||
28 [label="Function call: $subj$.R|/isOk|()"];
|
||||
29 [label="Exit safe call"];
|
||||
30 [label="Const: Boolean(true)"];
|
||||
31 [label="Equality operator =="];
|
||||
32 [label="Exit when branch condition"];
|
||||
}
|
||||
subgraph cluster_11 {
|
||||
color=blue
|
||||
26 [label="Enter when branch condition "];
|
||||
27 [label="Access variable R|<local>/base|"];
|
||||
28 [label="Type operator: (R|<local>/base| as? R|Sub|)"];
|
||||
29 [label="Enter safe call"];
|
||||
30 [label="Function call: $subj$.R|/isOk|()"];
|
||||
31 [label="Exit safe call"];
|
||||
32 [label="Const: Boolean(true)"];
|
||||
33 [label="Equality operator =="];
|
||||
33 [label="Enter when branch condition else"];
|
||||
34 [label="Exit when branch condition"];
|
||||
}
|
||||
35 [label="Enter when branch result"];
|
||||
subgraph cluster_12 {
|
||||
color=blue
|
||||
35 [label="Enter when branch condition else"];
|
||||
36 [label="Exit when branch condition"];
|
||||
36 [label="Enter block"];
|
||||
37 [label="Access variable R|<local>/base|"];
|
||||
38 [label="Exit block"];
|
||||
}
|
||||
37 [label="Enter when branch result"];
|
||||
39 [label="Exit when branch result"];
|
||||
40 [label="Enter when branch result"];
|
||||
subgraph cluster_13 {
|
||||
color=blue
|
||||
38 [label="Enter block"];
|
||||
39 [label="Access variable R|<local>/base|"];
|
||||
40 [label="Exit block"];
|
||||
41 [label="Enter block"];
|
||||
42 [label="Access variable R|<local>/base|"];
|
||||
43 [label="Access variable R|/Sub.data|"];
|
||||
44 [label="Exit block"];
|
||||
}
|
||||
41 [label="Exit when branch result"];
|
||||
42 [label="Enter when branch result"];
|
||||
subgraph cluster_14 {
|
||||
color=blue
|
||||
43 [label="Enter block"];
|
||||
44 [label="Access variable R|<local>/base|"];
|
||||
45 [label="Access variable R|/Sub.data|"];
|
||||
46 [label="Exit block"];
|
||||
}
|
||||
47 [label="Exit when branch result"];
|
||||
48 [label="Exit when"];
|
||||
45 [label="Exit when branch result"];
|
||||
46 [label="Exit when"];
|
||||
}
|
||||
49 [label="Jump: ^check when () {
|
||||
47 [label="Jump: ^check when () {
|
||||
==((R|<local>/base| as? R|Sub|)?.{ $subj$.R|/isOk|() }, Boolean(true)) -> {
|
||||
R|<local>/base|.R|/Sub.data|
|
||||
}
|
||||
@@ -131,40 +124,40 @@ digraph functionCallBound_kt {
|
||||
}
|
||||
}
|
||||
"];
|
||||
50 [label="Stub" style="filled" fillcolor=gray];
|
||||
51 [label="Exit block" style="filled" fillcolor=gray];
|
||||
48 [label="Stub" style="filled" fillcolor=gray];
|
||||
49 [label="Exit block" style="filled" fillcolor=gray];
|
||||
}
|
||||
52 [label="Exit function check" style="filled" fillcolor=red];
|
||||
50 [label="Exit function check" style="filled" fillcolor=red];
|
||||
}
|
||||
21 -> {22};
|
||||
22 -> {23};
|
||||
23 -> {24};
|
||||
24 -> {25};
|
||||
25 -> {26};
|
||||
26 -> {27};
|
||||
26 -> {27 29};
|
||||
27 -> {28};
|
||||
28 -> {29 31};
|
||||
28 -> {29};
|
||||
29 -> {30};
|
||||
30 -> {31};
|
||||
31 -> {32};
|
||||
32 -> {33};
|
||||
32 -> {40 33};
|
||||
33 -> {34};
|
||||
34 -> {42 35};
|
||||
34 -> {35};
|
||||
35 -> {36};
|
||||
36 -> {37};
|
||||
37 -> {38};
|
||||
38 -> {39};
|
||||
39 -> {40};
|
||||
39 -> {46};
|
||||
40 -> {41};
|
||||
41 -> {48};
|
||||
41 -> {42};
|
||||
42 -> {43};
|
||||
43 -> {44};
|
||||
44 -> {45};
|
||||
45 -> {46};
|
||||
46 -> {47};
|
||||
47 -> {48};
|
||||
48 -> {49};
|
||||
49 -> {52};
|
||||
47 -> {50};
|
||||
47 -> {48} [style=dotted];
|
||||
48 -> {49} [style=dotted];
|
||||
49 -> {50} [style=dotted];
|
||||
50 -> {51} [style=dotted];
|
||||
51 -> {52} [style=dotted];
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user