From bd8eaad885188c4ecc4a78d1096487e8636b3743 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 19 Jun 2020 15:44:23 +0300 Subject: [PATCH] [FIR-TEST] Update cfg dumps in some tests One of previous commit changed order for those graphs, but i didn't find which one --- .../testData/resolve/cfg/defaultArguments.dot | 2 +- .../testData/resolve/cfg/flowFromInplaceLambda.dot | 14 +++++++------- .../resolve/cfg/initBlockAndInPlaceLambda.dot | 2 +- .../cfg/inplaceLambdaInControlFlowExpressions.dot | 6 +++--- .../resolve/cfg/postponedLambdaInConstructor.dot | 2 +- .../resolve/cfg/returnValuesFromLambda.dot | 4 ++-- .../resolve/smartcasts/lambdas/inPlaceLambdas.dot | 6 +++--- .../smartcasts/receivers/implicitReceivers.dot | 4 ++-- .../resolve/smartcasts/smartcastToNothing.dot | 2 +- .../resolveWithStdlib/complexPostponedCfg.dot | 6 +++--- .../contracts/fromLibrary/callsInPlace.dot | 6 +++--- .../fromSource/good/callsInPlace/exactlyOnce.dot | 4 ++-- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.dot index f7552d4655f..0c9eb5c8288 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.dot @@ -79,7 +79,7 @@ digraph defaultArguments_kt { 23 -> {24}; 24 -> {25}; 25 -> {26}; - 26 -> {19} [color=green]; 26 -> {18} [color=red]; + 26 -> {19} [color=green]; } diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot index f601eddd3a0..0727691f9c6 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot @@ -150,8 +150,8 @@ digraph flowFromInplaceLambda_kt { 47 -> {48}; 48 -> {49}; 49 -> {50}; - 50 -> {39} [color=green]; 50 -> {38} [color=red]; + 50 -> {39} [color=green]; subgraph cluster_14 { color=red @@ -242,8 +242,8 @@ digraph flowFromInplaceLambda_kt { 78 -> {79}; 79 -> {80}; 80 -> {81}; - 81 -> {54} [color=green]; 81 -> {56} [color=red]; + 81 -> {54} [color=green]; 82 -> {83}; 83 -> {84}; 84 -> {85}; @@ -252,8 +252,8 @@ digraph flowFromInplaceLambda_kt { 87 -> {88}; 88 -> {89}; 89 -> {90}; - 90 -> {61} [color=green]; 90 -> {63} [color=red]; + 90 -> {61} [color=green]; subgraph cluster_20 { color=red @@ -342,8 +342,8 @@ digraph flowFromInplaceLambda_kt { 116 -> {117}; 117 -> {118}; 118 -> {119}; - 119 -> {94} [color=green]; 119 -> {100} [color=red]; + 119 -> {94} [color=green]; 120 -> {121}; 121 -> {122}; 122 -> {123}; @@ -354,8 +354,8 @@ digraph flowFromInplaceLambda_kt { 127 -> {128}; 128 -> {129}; 129 -> {130}; - 130 -> {98} [color=green]; 130 -> {100} [color=red]; + 130 -> {98} [color=green]; subgraph cluster_26 { color=red @@ -512,14 +512,14 @@ digraph flowFromInplaceLambda_kt { 185 -> {186}; 186 -> {187}; 187 -> {188}; - 188 -> {172} [color=green]; 188 -> {177} [color=red]; + 188 -> {172} [color=green]; 189 -> {190}; 190 -> {191}; 191 -> {192}; 192 -> {193}; - 193 -> {175} [color=green]; 193 -> {177} [color=red]; + 193 -> {175} [color=green]; subgraph cluster_38 { color=red diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.dot index cae6522cc40..939bee6eb87 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.dot @@ -82,8 +82,8 @@ digraph initBlockAndInPlaceLambda_kt { 24 -> {25}; 25 -> {26}; 26 -> {27}; - 27 -> {15} [color=green]; 27 -> {14} [color=red]; + 27 -> {15} [color=green]; subgraph cluster_8 { color=red diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot index f2e4058e481..198465fd462 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot @@ -112,8 +112,8 @@ digraph inplaceLambdaInControlFlowExpressions_kt { 34 -> {35}; 35 -> {36}; 36 -> {37}; - 37 -> {24} [color=green]; 37 -> {29} [color=red]; + 37 -> {24} [color=green]; subgraph cluster_11 { color=red @@ -191,8 +191,8 @@ digraph inplaceLambdaInControlFlowExpressions_kt { 59 -> {60}; 60 -> {61}; 61 -> {62}; - 62 -> {44} [color=green]; 62 -> {54} [color=red]; + 62 -> {44} [color=green]; subgraph cluster_20 { color=red @@ -235,7 +235,7 @@ digraph inplaceLambdaInControlFlowExpressions_kt { 74 -> {75}; 75 -> {76}; 76 -> {77}; - 77 -> {66} [color=green]; 77 -> {69} [color=red]; + 77 -> {66} [color=green]; } diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.dot index 4bf19286af6..c2b9a97dab5 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.dot @@ -82,8 +82,8 @@ digraph postponedLambdaInConstructor_kt { 20 -> {21 24}; 21 -> {22}; 22 -> {23}; - 23 -> {13} [color=green]; 23 -> {15} [color=red]; + 23 -> {13} [color=green]; 24 -> {25}; 25 -> {26}; 26 -> {27}; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/returnValuesFromLambda.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/returnValuesFromLambda.dot index 97022fa06b4..e148feb6c36 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/returnValuesFromLambda.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/returnValuesFromLambda.dot @@ -117,8 +117,8 @@ digraph returnValuesFromLambda_kt { 35 -> {36}; 36 -> {37}; 37 -> {38}; - 38 -> {16} [color=green]; 38 -> {15} [color=red]; + 38 -> {16} [color=green]; subgraph cluster_12 { color=red @@ -164,8 +164,8 @@ digraph returnValuesFromLambda_kt { 51 -> {52} [style=dotted]; 52 -> {53} [style=dotted]; 53 -> {54} [style=dotted]; - 54 -> {43} [color=green]; 54 -> {42} [color=red]; + 54 -> {43} [color=green]; subgraph cluster_16 { color=red diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.dot index 5458bfa962b..df6dc2199f0 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.dot @@ -101,8 +101,8 @@ digraph inPlaceLambdas_kt { 29 -> {30}; 30 -> {31}; 31 -> {32}; - 32 -> {20} [color=green]; 32 -> {19} [color=red]; + 32 -> {20} [color=green]; subgraph cluster_11 { color=red @@ -147,8 +147,8 @@ digraph inPlaceLambdas_kt { 45 -> {46}; 46 -> {47}; 47 -> {48}; - 48 -> {37} [color=green]; 48 -> {36} [color=red]; + 48 -> {37} [color=green]; subgraph cluster_15 { color=red @@ -228,7 +228,7 @@ digraph inPlaceLambdas_kt { 74 -> {75}; 75 -> {76}; 76 -> {77}; - 77 -> {61} [color=green]; 77 -> {60} [color=red]; + 77 -> {61} [color=green]; } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceivers.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceivers.dot index 3e1d7df2c80..1c55864a3fa 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceivers.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceivers.dot @@ -314,8 +314,8 @@ digraph implicitReceivers_kt { 93 -> {94}; 94 -> {95}; 95 -> {96}; - 96 -> {85} [color=green]; 96 -> {84} [color=red]; + 96 -> {85} [color=green]; 97 -> {98}; 98 -> {99}; 99 -> {100}; @@ -337,8 +337,8 @@ digraph implicitReceivers_kt { 114 -> {115}; 115 -> {116}; 116 -> {117}; - 117 -> {102} [color=green]; 117 -> {101} [color=red]; + 117 -> {102} [color=green]; subgraph cluster_32 { color=red diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot index 2d74918ed71..c3fc860c8ac 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot @@ -301,7 +301,7 @@ digraph smartcastToNothing_kt { 102 -> {103}; 103 -> {104}; 104 -> {105}; - 105 -> {95} [color=green]; 105 -> {94} [color=red]; + 105 -> {95} [color=green]; } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot index 9d0869038f7..b3ba0551b24 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot @@ -112,8 +112,8 @@ digraph complexPostponedCfg_kt { 24 -> {25}; 25 -> {26}; 26 -> {27}; - 27 -> {11} [color=green]; 27 -> {10} [color=red]; + 27 -> {11} [color=green]; 28 -> {29}; 29 -> {30}; 30 -> {31}; @@ -127,8 +127,8 @@ digraph complexPostponedCfg_kt { 37 -> {38} [color=green]; 38 -> {39}; 39 -> {40}; - 40 -> {24} [color=green]; 40 -> {10} [color=red]; + 40 -> {24} [color=green]; 41 -> {42}; 42 -> {43}; 43 -> {44}; @@ -137,7 +137,7 @@ digraph complexPostponedCfg_kt { 46 -> {47}; 47 -> {48}; 48 -> {49}; - 49 -> {37} [color=green]; 49 -> {36} [color=red]; + 49 -> {37} [color=green]; } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot index 6fc6a836b57..6da39bb8cfd 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot @@ -48,8 +48,8 @@ digraph callsInPlace_kt { 13 -> {14}; 14 -> {15}; 15 -> {16}; - 16 -> {5} [color=green]; 16 -> {4} [color=red]; + 16 -> {5} [color=green]; subgraph cluster_4 { color=red @@ -178,8 +178,8 @@ digraph callsInPlace_kt { 57 -> {58}; 58 -> {59}; 59 -> {60}; - 60 -> {48} [color=green]; 60 -> {47} [color=red]; + 60 -> {48} [color=green]; subgraph cluster_16 { color=red @@ -228,8 +228,8 @@ digraph callsInPlace_kt { 75 -> {76}; 76 -> {77}; 77 -> {78}; - 78 -> {66} [color=green]; 78 -> {65} [color=red]; + 78 -> {66} [color=green]; subgraph cluster_20 { color=red diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.dot index 5f7704d5ce8..991b6f6c673 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.dot @@ -80,8 +80,8 @@ digraph exactlyOnce_kt { 23 -> {24}; 24 -> {25}; 25 -> {26}; - 26 -> {15} [color=green]; 26 -> {14} [color=red]; + 26 -> {15} [color=green]; subgraph cluster_8 { color=red @@ -128,7 +128,7 @@ digraph exactlyOnce_kt { 40 -> {41}; 41 -> {42}; 42 -> {43}; - 43 -> {32} [color=green]; 43 -> {31} [color=red]; + 43 -> {32} [color=green]; }