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

[FIR] do not create FirParameter for catch parameter

Browse Source 
use FirProperty instead

^KT-55034
This commit is contained in:
Ilya Kirillov
2022-11-18 16:38:15 +01:00
parent 9671e20f1f
commit c8e3103af9
24 changed files with 450 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot
Vendored
+46 -44
View File
@@ -135,14 +135,14 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
44 [label="Postponed enter to lambda"];
subgraph cluster_16 {
color=blue
59 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
60 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_17 {
color=blue
60 [label="Enter block"];
61 [label="Function call: R|/materialize|<R|kotlin/String|>()"];
62 [label="Exit block"];
61 [label="Enter block"];
62 [label="Function call: R|/materialize|<R|kotlin/String|>()"];
63 [label="Exit block"];
}
63 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
64 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
}
45 [label="Postponed exit from lambda"];
46 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)"];
@@ -153,36 +153,37 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
subgraph cluster_18 {
color=blue
49 [label="Catch enter"];
50 [label="Variable declaration: e: R|kotlin/Exception|"];
subgraph cluster_19 {
color=blue
50 [label="Enter block"];
51 [label="Const: String()"];
52 [label="Exit block"];
51 [label="Enter block"];
52 [label="Const: String()"];
53 [label="Exit block"];
}
53 [label="Catch exit"];
54 [label="Catch exit"];
}
54 [label="Try expression exit"];
55 [label="Try expression exit"];
}
55 [label="Call arguments union" style="filled" fillcolor=yellow];
56 [label="Variable declaration: lval x: R|kotlin/String|"];
57 [label="Exit block"];
56 [label="Call arguments union" style="filled" fillcolor=yellow];
57 [label="Variable declaration: lval x: R|kotlin/String|"];
58 [label="Exit block"];
}
58 [label="Exit function test_2" style="filled" fillcolor=red];
59 [label="Exit function test_2" style="filled" fillcolor=red];
}
39 -> {40};
40 -> {41};
41 -> {42 49};
42 -> {43};
43 -> {44};
44 -> {59};
44 -> {60};
44 -> {45} [color=red];
44 -> {59} [style=dashed];
44 -> {60} [style=dashed];
45 -> {46};
46 -> {47};
47 -> {48};
48 -> {54 49};
48 -> {55 49};
49 -> {50};
49 -> {58} [label=onUncaughtException];
49 -> {59} [label=onUncaughtException];
50 -> {51};
51 -> {52};
52 -> {53};
@@ -191,56 +192,57 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
55 -> {56};
56 -> {57};
57 -> {58};
59 -> {60};
58 -> {59};
60 -> {61};
61 -> {62};
62 -> {63};
63 -> {55} [color=red];
63 -> {45} [color=green];
63 -> {64};
64 -> {56} [color=red];
64 -> {45} [color=green];
subgraph cluster_20 {
color=red
64 [label="Enter function test_3" style="filled" fillcolor=red];
65 [label="Enter function test_3" style="filled" fillcolor=red];
subgraph cluster_21 {
color=blue
65 [label="Enter block"];
66 [label="Postponed enter to lambda"];
66 [label="Enter block"];
67 [label="Postponed enter to lambda"];
subgraph cluster_22 {
color=blue
74 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
75 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
subgraph cluster_23 {
color=blue
75 [label="Enter block"];
76 [label="Function call: R|/materialize|<R|kotlin/String?|>()"];
77 [label="Exit block"];
76 [label="Enter block"];
77 [label="Function call: R|/materialize|<R|kotlin/String?|>()"];
78 [label="Exit block"];
}
78 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
79 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
}
67 [label="Postponed exit from lambda"];
68 [label="Function call: R|kotlin/run|<R|kotlin/String?|>(...)"];
69 [label="Check not null: R|kotlin/run|<R|kotlin/String?|>(...)!!"];
70 [label="Call arguments union" style="filled" fillcolor=yellow];
71 [label="Variable declaration: lval x: R|kotlin/String|"];
72 [label="Exit block"];
68 [label="Postponed exit from lambda"];
69 [label="Function call: R|kotlin/run|<R|kotlin/String?|>(...)"];
70 [label="Check not null: R|kotlin/run|<R|kotlin/String?|>(...)!!"];
71 [label="Call arguments union" style="filled" fillcolor=yellow];
72 [label="Variable declaration: lval x: R|kotlin/String|"];
73 [label="Exit block"];
}
73 [label="Exit function test_3" style="filled" fillcolor=red];
74 [label="Exit function test_3" style="filled" fillcolor=red];
}
64 -> {65};
65 -> {66};
66 -> {74};
66 -> {67} [color=red];
66 -> {74} [style=dashed];
67 -> {68};
66 -> {67};
67 -> {75};
67 -> {68} [color=red];
67 -> {75} [style=dashed];
68 -> {69};
69 -> {70};
70 -> {71};
71 -> {72};
72 -> {73};
74 -> {75};
73 -> {74};
75 -> {76};
76 -> {77};
77 -> {78};
78 -> {70} [color=red];
78 -> {67} [color=green];
78 -> {79};
79 -> {71} [color=red];
79 -> {68} [color=green];
}