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

[FIR] Make sure the primary constructor is first in class CFG

Browse Source 
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
This commit is contained in:
Brian Norman
2024-01-18 20:17:17 -06:00
committed by Space Team
parent c628172235
commit 17a1871b83
28 changed files with 732 additions and 900 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/smartcasts/smartCastInInit.dot
Vendored
+26 -26
View File
@@ -65,43 +65,43 @@ digraph smartCastInInit_kt {
18 [label="Enter class Main" style="filled" fillcolor=red];
subgraph cluster_8 {
color=blue
19 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_9 {
19 [label="Enter function <init>" style="filled" fillcolor=red];
20 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
21 [label="Exit function <init>" style="filled" fillcolor=red];
}
subgraph cluster_9 {
color=blue
22 [label="Enter init block" style="filled" fillcolor=red];
subgraph cluster_10 {
color=blue
20 [label="Enter block"];
subgraph cluster_10 {
color=blue
21 [label="Function call arguments enter"];
22 [label="Function call arguments exit"];
}
23 [label="Function call: R|/s|()" style="filled" fillcolor=yellow];
24 [label="Assignment: R|/Main.x|"];
23 [label="Enter block"];
subgraph cluster_11 {
color=blue
25 [label="Function call arguments enter"];
26 [label="Access variable R|/Main.x|"];
27 [label="Smart cast: this@R|/Main|.R|/Main.x|"];
28 [label="Function call arguments exit"];
24 [label="Function call arguments enter"];
25 [label="Function call arguments exit"];
}
29 [label="Function call: this@R|/Main|.R|/Main.x|.R|/S.foo|()" style="filled" fillcolor=yellow];
30 [label="Exit block"];
26 [label="Function call: R|/s|()" style="filled" fillcolor=yellow];
27 [label="Assignment: R|/Main.x|"];
subgraph cluster_12 {
color=blue
28 [label="Function call arguments enter"];
29 [label="Access variable R|/Main.x|"];
30 [label="Smart cast: this@R|/Main|.R|/Main.x|"];
31 [label="Function call arguments exit"];
}
32 [label="Function call: this@R|/Main|.R|/Main.x|.R|/S.foo|()" style="filled" fillcolor=yellow];
33 [label="Exit block"];
}
31 [label="Exit init block" style="filled" fillcolor=red];
}
subgraph cluster_12 {
color=blue
32 [label="Enter function <init>" style="filled" fillcolor=red];
33 [label="Delegated constructor call: super<R|kotlin/Any|>()" style="filled" fillcolor=yellow];
34 [label="Exit function <init>" style="filled" fillcolor=red];
34 [label="Exit init block" style="filled" fillcolor=red];
}
35 [label="Exit class Main" style="filled" fillcolor=red];
}
18 -> {19} [color=green];
18 -> {35} [style=dotted];
18 -> {19 32} [style=dashed];
18 -> {19 22} [style=dashed];
19 -> {20};
20 -> {21};
21 -> {22};
21 -> {22} [color=green];
22 -> {23};
23 -> {24};
24 -> {25};
@@ -111,7 +111,7 @@ digraph smartCastInInit_kt {
28 -> {29};
29 -> {30};
30 -> {31};
31 -> {32} [color=green];
31 -> {32};
32 -> {33};
33 -> {34};
34 -> {35} [color=green];