Brian Norman
17a1871b83
The primary constructor of a class needs to be the first subgraph of the class control-flow graph. Based on the Kotlin specification, class initialization order goes first primary constructor, in-place declarations (properties and init blocks), and then secondary constructors. If the class doesn't have a primary constructor, then it is just skipped in the order. Unfortunately, the class control-flow graph had in-place declarations first and then all constructors. Instead, we should treat the primary constructor as the first in-place declaration, and then continue with the existing processing as secondary constructors. This will guarantee that super constructor calls have the correct property initialization information. ^KT-65093 Fixed
100 lines
3.5 KiB
Plaintext
Vendored
100 lines
3.5 KiB
Plaintext
Vendored
digraph secondaryConstructorCfg_kt {
|
|
graph [nodesep=3]
|
|
node [shape=box penwidth=2]
|
|
edge [penwidth=2]
|
|
|
|
subgraph cluster_0 {
|
|
color=red
|
|
0 [label="Enter file secondaryConstructorCfg.kt" style="filled" fillcolor=red];
|
|
1 [label="Exit file secondaryConstructorCfg.kt" style="filled" fillcolor=red];
|
|
}
|
|
0 -> {1} [color=green];
|
|
|
|
subgraph cluster_1 {
|
|
color=red
|
|
2 [label="Enter class B" style="filled" fillcolor=red];
|
|
subgraph cluster_2 {
|
|
color=blue
|
|
3 [label="Enter function <init>" style="filled" fillcolor=red];
|
|
4 [label="Access variable R|<local>/p0|"];
|
|
5 [label="Delegated constructor call: this<R|B|>(...)" style="filled" fillcolor=yellow];
|
|
subgraph cluster_3 {
|
|
color=blue
|
|
6 [label="Enter function <init>" style="filled" fillcolor=red];
|
|
7 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
|
|
8 [label="Exit function <init>" style="filled" fillcolor=red];
|
|
}
|
|
subgraph cluster_4 {
|
|
color=blue
|
|
9 [label="Enter property" style="filled" fillcolor=red];
|
|
10 [label="Access variable R|<local>/p0|"];
|
|
11 [label="Exit property" style="filled" fillcolor=red];
|
|
}
|
|
subgraph cluster_5 {
|
|
color=blue
|
|
12 [label="Enter property" style="filled" fillcolor=red];
|
|
13 [label="Access variable R|<local>/p0|"];
|
|
14 [label="Access variable R|kotlin/String.length|"];
|
|
15 [label="Exit property" style="filled" fillcolor=red];
|
|
}
|
|
subgraph cluster_6 {
|
|
color=blue
|
|
16 [label="Enter init block" style="filled" fillcolor=red];
|
|
subgraph cluster_7 {
|
|
color=blue
|
|
17 [label="Enter block"];
|
|
18 [label="Access variable R|<local>/p0|"];
|
|
19 [label="Access variable R|kotlin/String.length|"];
|
|
20 [label="Assignment: R|/B.p1|"];
|
|
21 [label="Const: String()"];
|
|
22 [label="Assignment: R|/B.p3|"];
|
|
23 [label="Exit block"];
|
|
}
|
|
24 [label="Exit init block" style="filled" fillcolor=red];
|
|
}
|
|
subgraph cluster_8 {
|
|
color=blue
|
|
25 [label="Enter block"];
|
|
26 [label="Access variable R|<local>/p1|"];
|
|
27 [label="Assignment: R|/B.p3|"];
|
|
28 [label="Exit block"];
|
|
}
|
|
29 [label="Exit function <init>" style="filled" fillcolor=red];
|
|
}
|
|
30 [label="Exit class B" style="filled" fillcolor=red];
|
|
}
|
|
2 -> {3 6} [color=green];
|
|
2 -> {30} [style=dotted];
|
|
2 -> {3 6 9 12 16} [style=dashed];
|
|
3 -> {4};
|
|
4 -> {5};
|
|
5 -> {6} [color=green label="return@/B.B"];
|
|
5 -> {25} [color=red];
|
|
6 -> {7};
|
|
7 -> {8};
|
|
8 -> {9} [color=green];
|
|
9 -> {10};
|
|
10 -> {11};
|
|
11 -> {12} [color=green];
|
|
12 -> {13};
|
|
13 -> {14};
|
|
14 -> {15};
|
|
15 -> {16} [color=green];
|
|
16 -> {17};
|
|
17 -> {18};
|
|
18 -> {19};
|
|
19 -> {20};
|
|
20 -> {21};
|
|
21 -> {22};
|
|
22 -> {23};
|
|
23 -> {24};
|
|
24 -> {25} [color=green label="return@/B.B"];
|
|
24 -> {30} [color=green];
|
|
25 -> {26};
|
|
26 -> {27};
|
|
27 -> {28};
|
|
28 -> {29};
|
|
29 -> {30} [color=green];
|
|
|
|
}
|