From e86b87fe0bd00e8e247e0df399442744850378c8 Mon Sep 17 00:00:00 2001 From: pyos Date: Tue, 13 Dec 2022 10:21:08 +0100 Subject: [PATCH] Test: FIR CFA: fix the names of some nodes --- .../resolve/cfg/annotatedLocalClass.dot | 2 +- .../testData/resolve/cfg/complex.dot | 2 +- .../testData/resolve/cfg/defaultArguments.dot | 4 +- .../resolve/cfg/flowFromInplaceLambda.dot | 100 +++++++++--------- .../resolve/cfg/flowFromInplaceLambda2.dot | 64 +++++------ .../resolve/cfg/flowFromInplaceLambda3.dot | 20 ++-- .../resolve/cfg/flowFromTwoInplaceLambdas.dot | 64 +++++------ .../resolve/cfg/initBlockAndInPlaceLambda.dot | 4 +- .../inplaceLambdaInControlFlowExpressions.dot | 12 +-- .../testData/resolve/cfg/jumps.dot | 10 +- .../resolve/cfg/lambdaAsReturnOfLambda.dot | 8 +- .../resolve/cfg/lambdaReturningObject.dot | 4 +- .../testData/resolve/cfg/lambdas.dot | 16 +-- .../resolve/cfg/localClassesWithImplicit.dot | 18 ++-- .../testData/resolve/cfg/loops.dot | 18 ++-- .../cfg/postponedLambdaInConstructor.dot | 8 +- .../resolve/cfg/postponedLambdaInReturn.dot | 26 ++--- .../testData/resolve/cfg/postponedLambdas.dot | 4 +- .../resolve/cfg/propertiesAndInitBlocks.dot | 22 ++-- .../resolve/cfg/returnValuesFromLambda.dot | 12 +-- .../testData/resolve/cfg/tryCatch.dot | 2 +- .../testData/resolve/classCallInLambda.dot | 4 +- .../boundSmartcastsInBranches.dot | 2 +- .../smartcasts/controlStructures/returns.dot | 8 +- .../incorrectSmartcastToNothing.dot | 4 +- .../smartcasts/lambdas/inPlaceLambdas.dot | 12 +-- .../smartcasts/lambdas/lambdaInWhenBranch.dot | 4 +- .../loops/dataFlowInfoFromWhileCondition.dot | 2 +- .../resolve/smartcasts/loops/endlessLoops.dot | 14 +-- .../resolve/smartcasts/nullability.dot | 4 +- .../receivers/implicitReceivers.dot | 12 +-- .../receivers/thisOfExtensionProperty.dot | 8 +- .../smartcasts/safeCalls/safeCalls.dot | 8 +- .../resolve/smartcasts/smartcastToNothing.dot | 14 +-- .../resolveWithStdlib/complexPostponedCfg.dot | 12 +-- .../contracts/fromLibrary/callsInPlace.dot | 40 +++---- .../bad/callsInPlace/inLocalClass.dot | 2 +- .../bad/callsInPlace/inLocalFunction.dot | 2 +- .../good/callsInPlace/atLeastOnce.dot | 8 +- .../good/callsInPlace/atMostOnce.dot | 8 +- .../good/callsInPlace/exactlyOnce.dot | 8 +- .../fromSource/good/callsInPlace/flow.dot | 4 +- .../good/callsInPlace/inPlaceLambda.dot | 4 +- .../fromSource/good/callsInPlace/unknown.dot | 8 +- .../delegates/delegateWithAnonymousObject.dot | 12 +-- .../inference/plusAssignWithLambdaInRhs.dot | 12 +-- .../smartcasts/tryWithLambdaInside.dot | 8 +- .../fir/resolve/dfa/cfg/CFGNodeRenderer.kt | 20 +--- .../codegen/box/smartCasts/kt44814.dot | 8 +- 49 files changed, 331 insertions(+), 341 deletions(-) diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/annotatedLocalClass.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/annotatedLocalClass.dot index 468049ac3b9..b154607e69a 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/annotatedLocalClass.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/annotatedLocalClass.dot @@ -48,7 +48,7 @@ digraph annotatedLocalClass_kt { 17 [label="Exit when branch result" style="filled" fillcolor=gray]; 18 [label="Exit when"]; } - 19 [label="Exit local class foo"]; + 19 [label="Local class declaration"]; 20 [label="Function call: R|/bar|()" style="filled" fillcolor=yellow]; 21 [label="Exit block"]; } diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot index e0504dd43e8..0cc70c3c276 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot @@ -234,7 +234,7 @@ digraph complex_kt { } 85 [label="Exit loop block"]; } - 86 [label="Exit whileloop"]; + 86 [label="Exit while loop"]; } 87 [label="Exit block"]; } diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.dot index da22067582b..88c10ad078b 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.dot @@ -43,14 +43,14 @@ digraph defaultArguments_kt { 16 [label="Postponed enter to lambda"]; subgraph cluster_5 { color=blue - 17 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 17 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_6 { color=blue 18 [label="Enter block"]; 19 [label="Function call: R|/foo|()" style="filled" fillcolor=yellow]; 20 [label="Exit block"]; } - 21 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 21 [label="Exit function " style="filled" fillcolor=red]; } 22 [label="Postponed exit from lambda"]; 23 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot index 5de13d13bf9..de004cd30ce 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot @@ -215,7 +215,7 @@ digraph flowFromInplaceLambda_kt { 70 [label="Postponed enter to lambda"]; subgraph cluster_22 { color=blue - 71 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 71 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_23 { color=blue 72 [label="Enter block"]; @@ -223,7 +223,7 @@ digraph flowFromInplaceLambda_kt { 74 [label="Type operator: (R|/x| as R|kotlin/Int|)"]; 75 [label="Exit block"]; } - 76 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 76 [label="Exit function " style="filled" fillcolor=red]; } 77 [label="Postponed exit from lambda"]; 78 [label="Function call: R|/exactlyOnce|(...)" style="filled" fillcolor=yellow]; @@ -261,7 +261,7 @@ digraph flowFromInplaceLambda_kt { 86 [label="Postponed enter to lambda"]; subgraph cluster_26 { color=blue - 87 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 87 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_27 { color=blue 88 [label="Enter block"]; @@ -271,7 +271,7 @@ digraph flowFromInplaceLambda_kt { 92 [label="Type operator: (R|/x| as R|kotlin/Int|)"]; 93 [label="Exit block"]; } - 94 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 94 [label="Exit function " style="filled" fillcolor=red]; } 95 [label="Postponed exit from lambda"]; 96 [label="Function call: R|/exactlyOnce|(...)" style="filled" fillcolor=yellow]; @@ -281,7 +281,7 @@ digraph flowFromInplaceLambda_kt { 100 [label="Postponed enter to lambda"]; subgraph cluster_28 { color=blue - 101 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 101 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_29 { color=blue 102 [label="Enter block"]; @@ -294,7 +294,7 @@ digraph flowFromInplaceLambda_kt { 109 [label="Const: Int(1)"]; 110 [label="Exit block"]; } - 111 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 111 [label="Exit function " style="filled" fillcolor=red]; } 112 [label="Postponed exit from lambda"]; 113 [label="Function call: R|/exactlyOnce|(...)" style="filled" fillcolor=yellow]; @@ -365,7 +365,7 @@ digraph flowFromInplaceLambda_kt { 126 [label="Postponed enter to lambda"]; subgraph cluster_32 { color=blue - 127 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 127 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_33 { color=blue 128 [label="Enter block"]; @@ -375,7 +375,7 @@ digraph flowFromInplaceLambda_kt { 132 [label="Type operator: (R|/x| as R|kotlin/Int|)"]; 133 [label="Exit block"]; } - 134 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 134 [label="Exit function " style="filled" fillcolor=red]; } 135 [label="Postponed exit from lambda"]; 136 [label="Function call: R|/atLeastOnce|(...)" style="filled" fillcolor=yellow]; @@ -385,7 +385,7 @@ digraph flowFromInplaceLambda_kt { 140 [label="Postponed enter to lambda"]; subgraph cluster_34 { color=blue - 141 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 141 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_35 { color=blue 142 [label="Enter block"]; @@ -398,7 +398,7 @@ digraph flowFromInplaceLambda_kt { 149 [label="Const: Int(1)"]; 150 [label="Exit block"]; } - 151 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 151 [label="Exit function " style="filled" fillcolor=red]; } 152 [label="Postponed exit from lambda"]; 153 [label="Function call: R|/atLeastOnce|(...)" style="filled" fillcolor=yellow]; @@ -471,7 +471,7 @@ digraph flowFromInplaceLambda_kt { 166 [label="Postponed enter to lambda"]; subgraph cluster_38 { color=blue - 167 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 167 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_39 { color=blue 168 [label="Enter block"]; @@ -481,7 +481,7 @@ digraph flowFromInplaceLambda_kt { 172 [label="Type operator: (R|/x| as R|kotlin/Int|)"]; 173 [label="Exit block"]; } - 174 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 174 [label="Exit function " style="filled" fillcolor=red]; } 175 [label="Postponed exit from lambda"]; 176 [label="Function call: R|/atMostOnce|(...)" style="filled" fillcolor=yellow]; @@ -491,7 +491,7 @@ digraph flowFromInplaceLambda_kt { 180 [label="Postponed enter to lambda"]; subgraph cluster_40 { color=blue - 181 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 181 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_41 { color=blue 182 [label="Enter block"]; @@ -503,7 +503,7 @@ digraph flowFromInplaceLambda_kt { 188 [label="Const: Int(1)"]; 189 [label="Exit block"]; } - 190 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 190 [label="Exit function " style="filled" fillcolor=red]; } 191 [label="Postponed exit from lambda"]; 192 [label="Function call: R|/atMostOnce|(...)" style="filled" fillcolor=yellow]; @@ -569,7 +569,7 @@ digraph flowFromInplaceLambda_kt { 204 [label="Postponed enter to lambda"]; subgraph cluster_44 { color=blue - 205 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 205 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_45 { color=blue 206 [label="Enter block"]; @@ -579,7 +579,7 @@ digraph flowFromInplaceLambda_kt { 210 [label="Type operator: (R|/x| as R|kotlin/Int|)"]; 211 [label="Exit block"]; } - 212 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 212 [label="Exit function " style="filled" fillcolor=red]; } 213 [label="Postponed exit from lambda"]; 214 [label="Function call: R|/unknown|(...)" style="filled" fillcolor=yellow]; @@ -589,7 +589,7 @@ digraph flowFromInplaceLambda_kt { 218 [label="Postponed enter to lambda"]; subgraph cluster_46 { color=blue - 219 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 219 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_47 { color=blue 220 [label="Enter block"]; @@ -601,7 +601,7 @@ digraph flowFromInplaceLambda_kt { 226 [label="Const: Int(1)"]; 227 [label="Exit block"]; } - 228 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 228 [label="Exit function " style="filled" fillcolor=red]; } 229 [label="Postponed exit from lambda"]; 230 [label="Function call: R|/unknown|(...)" style="filled" fillcolor=yellow]; @@ -669,7 +669,7 @@ digraph flowFromInplaceLambda_kt { 242 [label="Postponed enter to lambda"]; subgraph cluster_50 { color=blue - 243 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 243 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_51 { color=blue 244 [label="Enter block"]; @@ -679,7 +679,7 @@ digraph flowFromInplaceLambda_kt { 248 [label="Type operator: (R|/x| as R|kotlin/Int|)"]; 249 [label="Exit block"]; } - 250 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 250 [label="Exit function " style="filled" fillcolor=red]; } 251 [label="Postponed exit from lambda"]; 252 [label="Function call: R|/noContract|(...)" style="filled" fillcolor=yellow]; @@ -689,7 +689,7 @@ digraph flowFromInplaceLambda_kt { 256 [label="Postponed enter to lambda"]; subgraph cluster_52 { color=blue - 257 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 257 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_53 { color=blue 258 [label="Enter block"]; @@ -701,7 +701,7 @@ digraph flowFromInplaceLambda_kt { 264 [label="Const: Int(1)"]; 265 [label="Exit block"]; } - 266 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 266 [label="Exit function " style="filled" fillcolor=red]; } 267 [label="Postponed exit from lambda"]; 268 [label="Function call: R|/noContract|(...)" style="filled" fillcolor=yellow]; @@ -765,7 +765,7 @@ digraph flowFromInplaceLambda_kt { 280 [label="Postponed enter to lambda"]; subgraph cluster_56 { color=blue - 281 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 281 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_57 { color=blue 282 [label="Enter block"]; @@ -779,7 +779,7 @@ digraph flowFromInplaceLambda_kt { 290 [label="Function call: R|/materialize|()" style="filled" fillcolor=yellow]; 291 [label="Exit block"]; } - 292 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 292 [label="Exit function " style="filled" fillcolor=red]; } 293 [label="Postponed exit from lambda"]; 294 [label="Function call: R|/exactlyOnce|(...)" style="filled" fillcolor=yellow]; @@ -787,7 +787,7 @@ digraph flowFromInplaceLambda_kt { 296 [label="Postponed enter to lambda"]; subgraph cluster_58 { color=blue - 297 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 297 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_59 { color=blue 298 [label="Enter block"]; @@ -801,7 +801,7 @@ digraph flowFromInplaceLambda_kt { 306 [label="Const: Int(1)"]; 307 [label="Exit block"]; } - 308 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 308 [label="Exit function " style="filled" fillcolor=red]; } 309 [label="Postponed exit from lambda"]; 310 [label="Function call: R|/exactlyOnce|(...)" style="filled" fillcolor=yellow]; @@ -875,7 +875,7 @@ digraph flowFromInplaceLambda_kt { 323 [label="Postponed enter to lambda"]; subgraph cluster_62 { color=blue - 324 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 324 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_63 { color=blue 325 [label="Enter block"]; @@ -889,7 +889,7 @@ digraph flowFromInplaceLambda_kt { 333 [label="Function call: R|/materialize|()" style="filled" fillcolor=yellow]; 334 [label="Exit block"]; } - 335 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 335 [label="Exit function " style="filled" fillcolor=red]; } 336 [label="Postponed exit from lambda"]; 337 [label="Function call: R|/atLeastOnce|(...)" style="filled" fillcolor=yellow]; @@ -897,7 +897,7 @@ digraph flowFromInplaceLambda_kt { 339 [label="Postponed enter to lambda"]; subgraph cluster_64 { color=blue - 340 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 340 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_65 { color=blue 341 [label="Enter block"]; @@ -911,7 +911,7 @@ digraph flowFromInplaceLambda_kt { 349 [label="Const: Int(1)"]; 350 [label="Exit block"]; } - 351 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 351 [label="Exit function " style="filled" fillcolor=red]; } 352 [label="Postponed exit from lambda"]; 353 [label="Function call: R|/atLeastOnce|(...)" style="filled" fillcolor=yellow]; @@ -987,7 +987,7 @@ digraph flowFromInplaceLambda_kt { 366 [label="Postponed enter to lambda"]; subgraph cluster_68 { color=blue - 367 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 367 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_69 { color=blue 368 [label="Enter block"]; @@ -1001,7 +1001,7 @@ digraph flowFromInplaceLambda_kt { 376 [label="Function call: R|/materialize|()" style="filled" fillcolor=yellow]; 377 [label="Exit block"]; } - 378 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 378 [label="Exit function " style="filled" fillcolor=red]; } 379 [label="Postponed exit from lambda"]; 380 [label="Function call: R|/atMostOnce|(...)" style="filled" fillcolor=yellow]; @@ -1009,7 +1009,7 @@ digraph flowFromInplaceLambda_kt { 382 [label="Postponed enter to lambda"]; subgraph cluster_70 { color=blue - 383 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 383 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_71 { color=blue 384 [label="Enter block"]; @@ -1023,7 +1023,7 @@ digraph flowFromInplaceLambda_kt { 392 [label="Const: Int(1)"]; 393 [label="Exit block"]; } - 394 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 394 [label="Exit function " style="filled" fillcolor=red]; } 395 [label="Postponed exit from lambda"]; 396 [label="Function call: R|/atMostOnce|(...)" style="filled" fillcolor=yellow]; @@ -1091,7 +1091,7 @@ digraph flowFromInplaceLambda_kt { 407 [label="Postponed enter to lambda"]; subgraph cluster_74 { color=blue - 408 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 408 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_75 { color=blue 409 [label="Enter block"]; @@ -1105,7 +1105,7 @@ digraph flowFromInplaceLambda_kt { 417 [label="Function call: R|/materialize|()" style="filled" fillcolor=yellow]; 418 [label="Exit block"]; } - 419 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 419 [label="Exit function " style="filled" fillcolor=red]; } 420 [label="Postponed exit from lambda"]; 421 [label="Function call: R|/unknown|(...)" style="filled" fillcolor=yellow]; @@ -1113,7 +1113,7 @@ digraph flowFromInplaceLambda_kt { 423 [label="Postponed enter to lambda"]; subgraph cluster_76 { color=blue - 424 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 424 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_77 { color=blue 425 [label="Enter block"]; @@ -1127,7 +1127,7 @@ digraph flowFromInplaceLambda_kt { 433 [label="Const: Int(1)"]; 434 [label="Exit block"]; } - 435 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 435 [label="Exit function " style="filled" fillcolor=red]; } 436 [label="Postponed exit from lambda"]; 437 [label="Function call: R|/unknown|(...)" style="filled" fillcolor=yellow]; @@ -1197,7 +1197,7 @@ digraph flowFromInplaceLambda_kt { 448 [label="Postponed enter to lambda"]; subgraph cluster_80 { color=blue - 449 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 449 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_81 { color=blue 450 [label="Enter block"]; @@ -1211,7 +1211,7 @@ digraph flowFromInplaceLambda_kt { 458 [label="Function call: R|/materialize|()" style="filled" fillcolor=yellow]; 459 [label="Exit block"]; } - 460 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 460 [label="Exit function " style="filled" fillcolor=red]; } 461 [label="Postponed exit from lambda"]; 462 [label="Function call: R|/noContract|(...)" style="filled" fillcolor=yellow]; @@ -1219,7 +1219,7 @@ digraph flowFromInplaceLambda_kt { 464 [label="Postponed enter to lambda"]; subgraph cluster_82 { color=blue - 465 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 465 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_83 { color=blue 466 [label="Enter block"]; @@ -1233,7 +1233,7 @@ digraph flowFromInplaceLambda_kt { 474 [label="Const: Int(1)"]; 475 [label="Exit block"]; } - 476 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 476 [label="Exit function " style="filled" fillcolor=red]; } 477 [label="Postponed exit from lambda"]; 478 [label="Function call: R|/noContract|(...)" style="filled" fillcolor=yellow]; @@ -1299,28 +1299,28 @@ digraph flowFromInplaceLambda_kt { 489 [label="Postponed enter to lambda"]; subgraph cluster_86 { color=blue - 490 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 490 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_87 { color=blue 491 [label="Enter block"]; 492 [label="Function call: R|/materialize|()" style="filled" fillcolor=yellow]; 493 [label="Exit block"]; } - 494 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 494 [label="Exit function " style="filled" fillcolor=red]; } 495 [label="Postponed exit from lambda"]; 496 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; 497 [label="Postponed enter to lambda"]; subgraph cluster_88 { color=blue - 498 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 498 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_89 { color=blue 499 [label="Enter block"]; 500 [label="Function call: R|/materialize|()" style="filled" fillcolor=yellow]; 501 [label="Exit block"]; } - 502 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 502 [label="Exit function " style="filled" fillcolor=red]; } 503 [label="Postponed exit from lambda"]; 504 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -1371,27 +1371,27 @@ digraph flowFromInplaceLambda_kt { 513 [label="Postponed enter to lambda"]; subgraph cluster_92 { color=blue - 514 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 514 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_93 { color=blue 515 [label="Enter block"]; 516 [label="Postponed enter to lambda"]; subgraph cluster_94 { color=blue - 517 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 517 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_95 { color=blue 518 [label="Enter block"]; 519 [label="Function call: R|/materialize|()" style="filled" fillcolor=yellow]; 520 [label="Exit block"]; } - 521 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 521 [label="Exit function " style="filled" fillcolor=red]; } 522 [label="Postponed exit from lambda"]; 523 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; 524 [label="Exit block"]; } - 525 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 525 [label="Exit function " style="filled" fillcolor=red]; } 526 [label="Postponed exit from lambda"]; 527 [label="Function call: R|/noContract|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda2.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda2.dot index 3119117d194..aaa5ac918e8 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda2.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda2.dot @@ -89,7 +89,7 @@ digraph flowFromInplaceLambda2_kt { 27 [label="Postponed enter to lambda"]; subgraph cluster_10 { color=blue - 28 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 28 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_11 { color=blue 29 [label="Enter block"]; @@ -98,7 +98,7 @@ digraph flowFromInplaceLambda2_kt { 32 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 33 [label="Exit block"]; } - 34 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 34 [label="Exit function " style="filled" fillcolor=red]; } 35 [label="Postponed exit from lambda"]; 36 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -107,7 +107,7 @@ digraph flowFromInplaceLambda2_kt { 39 [label="Postponed enter to lambda"]; subgraph cluster_12 { color=blue - 40 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 40 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_13 { color=blue 41 [label="Enter block"]; @@ -116,7 +116,7 @@ digraph flowFromInplaceLambda2_kt { 44 [label="Const: Int(123)"]; 45 [label="Exit block"]; } - 46 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 46 [label="Exit function " style="filled" fillcolor=red]; } 47 [label="Postponed exit from lambda"]; 48 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -173,7 +173,7 @@ digraph flowFromInplaceLambda2_kt { 57 [label="Postponed enter to lambda"]; subgraph cluster_16 { color=blue - 58 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 58 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_17 { color=blue 59 [label="Enter block"]; @@ -182,7 +182,7 @@ digraph flowFromInplaceLambda2_kt { 62 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 63 [label="Exit block"]; } - 64 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 64 [label="Exit function " style="filled" fillcolor=red]; } 65 [label="Postponed exit from lambda"]; 66 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -192,7 +192,7 @@ digraph flowFromInplaceLambda2_kt { 70 [label="Postponed enter to lambda"]; subgraph cluster_18 { color=blue - 71 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 71 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_19 { color=blue 72 [label="Enter block"]; @@ -201,7 +201,7 @@ digraph flowFromInplaceLambda2_kt { 75 [label="Const: Int(123)"]; 76 [label="Exit block"]; } - 77 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 77 [label="Exit function " style="filled" fillcolor=red]; } 78 [label="Postponed exit from lambda"]; 79 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -259,7 +259,7 @@ digraph flowFromInplaceLambda2_kt { 88 [label="Postponed enter to lambda"]; subgraph cluster_22 { color=blue - 89 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 89 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_23 { color=blue 90 [label="Enter block"]; @@ -268,7 +268,7 @@ digraph flowFromInplaceLambda2_kt { 93 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 94 [label="Exit block"]; } - 95 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 95 [label="Exit function " style="filled" fillcolor=red]; } 96 [label="Postponed exit from lambda"]; 97 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -308,7 +308,7 @@ digraph flowFromInplaceLambda2_kt { 116 [label="Postponed enter to lambda"]; subgraph cluster_29 { color=blue - 117 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 117 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_30 { color=blue 118 [label="Enter block"]; @@ -317,7 +317,7 @@ digraph flowFromInplaceLambda2_kt { 121 [label="Const: Int(123)"]; 122 [label="Exit block"]; } - 123 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 123 [label="Exit function " style="filled" fillcolor=red]; } 124 [label="Postponed exit from lambda"]; 125 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -426,14 +426,14 @@ digraph flowFromInplaceLambda2_kt { 153 [label="Postponed enter to lambda"]; subgraph cluster_40 { color=blue - 154 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 154 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_41 { color=blue 155 [label="Enter block"]; 156 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 157 [label="Exit block"]; } - 158 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 158 [label="Exit function " style="filled" fillcolor=red]; } 159 [label="Postponed exit from lambda"]; 160 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -447,7 +447,7 @@ digraph flowFromInplaceLambda2_kt { 165 [label="Postponed enter to lambda"]; subgraph cluster_43 { color=blue - 166 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 166 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_44 { color=blue 167 [label="Enter block"]; @@ -456,7 +456,7 @@ digraph flowFromInplaceLambda2_kt { 170 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 171 [label="Exit block"]; } - 172 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 172 [label="Exit function " style="filled" fillcolor=red]; } 173 [label="Postponed exit from lambda"]; 174 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -470,7 +470,7 @@ digraph flowFromInplaceLambda2_kt { 180 [label="Postponed enter to lambda"]; subgraph cluster_45 { color=blue - 181 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 181 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_46 { color=blue 182 [label="Enter block"]; @@ -480,7 +480,7 @@ digraph flowFromInplaceLambda2_kt { 186 [label="Const: Int(123)"]; 187 [label="Exit block"]; } - 188 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 188 [label="Exit function " style="filled" fillcolor=red]; } 189 [label="Postponed exit from lambda"]; 190 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -585,7 +585,7 @@ digraph flowFromInplaceLambda2_kt { 204 [label="Postponed enter to lambda"]; subgraph cluster_49 { color=blue - 205 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 205 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_50 { color=blue 206 [label="Enter block"]; @@ -594,7 +594,7 @@ digraph flowFromInplaceLambda2_kt { 209 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 210 [label="Exit block"]; } - 211 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 211 [label="Exit function " style="filled" fillcolor=red]; } 212 [label="Postponed exit from lambda"]; 213 [label="Function call: $subj$.R|kotlin/let|(...)" style="filled" fillcolor=yellow]; @@ -603,14 +603,14 @@ digraph flowFromInplaceLambda2_kt { 216 [label="Postponed enter to lambda"]; subgraph cluster_51 { color=blue - 217 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 217 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_52 { color=blue 218 [label="Enter block"]; 219 [label="Const: String()"]; 220 [label="Exit block"]; } - 221 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 221 [label="Exit function " style="filled" fillcolor=red]; } 222 [label="Postponed exit from lambda"]; 223 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -685,7 +685,7 @@ digraph flowFromInplaceLambda2_kt { 240 [label="Postponed enter to lambda"]; subgraph cluster_59 { color=blue - 241 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 241 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_60 { color=blue 242 [label="Enter block"]; @@ -694,7 +694,7 @@ digraph flowFromInplaceLambda2_kt { 245 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 246 [label="Exit block"]; } - 247 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 247 [label="Exit function " style="filled" fillcolor=red]; } 248 [label="Postponed exit from lambda"]; 249 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -708,7 +708,7 @@ digraph flowFromInplaceLambda2_kt { 254 [label="Postponed enter to lambda"]; subgraph cluster_62 { color=blue - 255 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 255 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_63 { color=blue 256 [label="Enter block"]; @@ -717,7 +717,7 @@ digraph flowFromInplaceLambda2_kt { 259 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 260 [label="Exit block"]; } - 261 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 261 [label="Exit function " style="filled" fillcolor=red]; } 262 [label="Postponed exit from lambda"]; 263 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -731,7 +731,7 @@ digraph flowFromInplaceLambda2_kt { 269 [label="Postponed enter to lambda"]; subgraph cluster_64 { color=blue - 270 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 270 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_65 { color=blue 271 [label="Enter block"]; @@ -740,7 +740,7 @@ digraph flowFromInplaceLambda2_kt { 274 [label="Const: Int(123)"]; 275 [label="Exit block"]; } - 276 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 276 [label="Exit function " style="filled" fillcolor=red]; } 277 [label="Postponed exit from lambda"]; 278 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -843,7 +843,7 @@ digraph flowFromInplaceLambda2_kt { 298 [label="Postponed enter to lambda"]; subgraph cluster_71 { color=blue - 299 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 299 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_72 { color=blue 300 [label="Enter block"]; @@ -852,7 +852,7 @@ digraph flowFromInplaceLambda2_kt { 303 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 304 [label="Exit block"]; } - 305 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 305 [label="Exit function " style="filled" fillcolor=red]; } 306 [label="Postponed exit from lambda"]; 307 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -861,7 +861,7 @@ digraph flowFromInplaceLambda2_kt { 310 [label="Postponed enter to lambda"]; subgraph cluster_73 { color=blue - 311 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 311 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_74 { color=blue 312 [label="Enter block"]; @@ -871,7 +871,7 @@ digraph flowFromInplaceLambda2_kt { 316 [label="Const: Int(123)"]; 317 [label="Exit block"]; } - 318 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 318 [label="Exit function " style="filled" fillcolor=red]; } 319 [label="Postponed exit from lambda"]; 320 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda3.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda3.dot index b8309fc2705..cb1ff70ba07 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda3.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda3.dot @@ -108,7 +108,7 @@ digraph flowFromInplaceLambda3_kt { 35 [label="Postponed enter to lambda"]; subgraph cluster_14 { color=blue - 36 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 36 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_15 { color=blue 37 [label="Enter block"]; @@ -116,7 +116,7 @@ digraph flowFromInplaceLambda3_kt { 39 [label="Assignment: R|/x|"]; 40 [label="Exit block"]; } - 41 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 41 [label="Exit function " style="filled" fillcolor=red]; } 42 [label="Postponed exit from lambda"]; 43 [label="Function call: R|/unknown|(...)" style="filled" fillcolor=yellow]; @@ -172,7 +172,7 @@ digraph flowFromInplaceLambda3_kt { 60 [label="Postponed enter to lambda"]; subgraph cluster_18 { color=blue - 61 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 61 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_19 { color=blue 62 [label="Enter block"]; @@ -180,7 +180,7 @@ digraph flowFromInplaceLambda3_kt { 64 [label="Assignment: R|/x|"]; 65 [label="Exit block"]; } - 66 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 66 [label="Exit function " style="filled" fillcolor=red]; } 67 [label="Postponed exit from lambda"]; 68 [label="Function call: R|/unknown|(...)" style="filled" fillcolor=yellow]; @@ -230,7 +230,7 @@ digraph flowFromInplaceLambda3_kt { 82 [label="Postponed enter to lambda"]; subgraph cluster_22 { color=blue - 83 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 83 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_23 { color=blue 84 [label="Enter block"]; @@ -238,7 +238,7 @@ digraph flowFromInplaceLambda3_kt { 86 [label="Assignment: R|/x|"]; 87 [label="Exit block"]; } - 88 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 88 [label="Exit function " style="filled" fillcolor=red]; } 89 [label="Postponed exit from lambda"]; 90 [label="Function call: R|/atLeastOnce|(...)" style="filled" fillcolor=yellow]; @@ -295,7 +295,7 @@ digraph flowFromInplaceLambda3_kt { 107 [label="Postponed enter to lambda"]; subgraph cluster_26 { color=blue - 108 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 108 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_27 { color=blue 109 [label="Enter block"]; @@ -303,7 +303,7 @@ digraph flowFromInplaceLambda3_kt { 111 [label="Assignment: R|/x|"]; 112 [label="Exit block"]; } - 113 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 113 [label="Exit function " style="filled" fillcolor=red]; } 114 [label="Postponed exit from lambda"]; 115 [label="Function call: R|/exactlyOnce|(...)" style="filled" fillcolor=yellow]; @@ -359,7 +359,7 @@ digraph flowFromInplaceLambda3_kt { 132 [label="Postponed enter to lambda"]; subgraph cluster_30 { color=blue - 133 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 133 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_31 { color=blue 134 [label="Enter block"]; @@ -367,7 +367,7 @@ digraph flowFromInplaceLambda3_kt { 136 [label="Assignment: R|/x|"]; 137 [label="Exit block"]; } - 138 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 138 [label="Exit function " style="filled" fillcolor=red]; } 139 [label="Postponed exit from lambda"]; 140 [label="Function call: R|/atMostOnce|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromTwoInplaceLambdas.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromTwoInplaceLambdas.dot index bbbf8ce5349..bf5c97321ce 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromTwoInplaceLambdas.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromTwoInplaceLambdas.dot @@ -76,7 +76,7 @@ digraph flowFromTwoInplaceLambdas_kt { 28 [label="Postponed enter to lambda"]; subgraph cluster_10 { color=blue - 29 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 29 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_11 { color=blue 30 [label="Enter block"]; @@ -86,11 +86,11 @@ digraph flowFromTwoInplaceLambdas_kt { 34 [label="Const: Int(123)"]; 35 [label="Exit block"]; } - 36 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 36 [label="Exit function " style="filled" fillcolor=red]; } subgraph cluster_12 { color=blue - 37 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 37 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_13 { color=blue 38 [label="Enter block"]; @@ -99,7 +99,7 @@ digraph flowFromTwoInplaceLambdas_kt { 41 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 42 [label="Exit block"]; } - 43 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 43 [label="Exit function " style="filled" fillcolor=red]; } 44 [label="Postponed exit from lambda"]; 45 [label="Postponed exit from lambda"]; @@ -185,7 +185,7 @@ digraph flowFromTwoInplaceLambdas_kt { 68 [label="Postponed enter to lambda"]; subgraph cluster_19 { color=blue - 69 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 69 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_20 { color=blue 70 [label="Enter block"]; @@ -195,11 +195,11 @@ digraph flowFromTwoInplaceLambdas_kt { 74 [label="Const: Int(123)"]; 75 [label="Exit block"]; } - 76 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 76 [label="Exit function " style="filled" fillcolor=red]; } subgraph cluster_21 { color=blue - 77 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 77 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_22 { color=blue 78 [label="Enter block"]; @@ -208,7 +208,7 @@ digraph flowFromTwoInplaceLambdas_kt { 81 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 82 [label="Exit block"]; } - 83 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 83 [label="Exit function " style="filled" fillcolor=red]; } 84 [label="Postponed exit from lambda"]; 85 [label="Postponed exit from lambda"]; @@ -280,7 +280,7 @@ digraph flowFromTwoInplaceLambdas_kt { 101 [label="Postponed enter to lambda"]; subgraph cluster_25 { color=blue - 102 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 102 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_26 { color=blue 103 [label="Enter block"]; @@ -289,11 +289,11 @@ digraph flowFromTwoInplaceLambdas_kt { 106 [label="Const: Int(123)"]; 107 [label="Exit block"]; } - 108 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 108 [label="Exit function " style="filled" fillcolor=red]; } subgraph cluster_27 { color=blue - 109 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 109 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_28 { color=blue 110 [label="Enter block"]; @@ -302,7 +302,7 @@ digraph flowFromTwoInplaceLambdas_kt { 113 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 114 [label="Exit block"]; } - 115 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 115 [label="Exit function " style="filled" fillcolor=red]; } 116 [label="Postponed exit from lambda"]; 117 [label="Postponed exit from lambda"]; @@ -368,7 +368,7 @@ digraph flowFromTwoInplaceLambdas_kt { 135 [label="Postponed enter to lambda"]; subgraph cluster_31 { color=blue - 136 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 136 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_32 { color=blue 137 [label="Enter block"]; @@ -377,11 +377,11 @@ digraph flowFromTwoInplaceLambdas_kt { 140 [label="Const: Int(123)"]; 141 [label="Exit block"]; } - 142 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 142 [label="Exit function " style="filled" fillcolor=red]; } subgraph cluster_33 { color=blue - 143 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 143 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_34 { color=blue 144 [label="Enter block"]; @@ -390,7 +390,7 @@ digraph flowFromTwoInplaceLambdas_kt { 147 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 148 [label="Exit block"]; } - 149 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 149 [label="Exit function " style="filled" fillcolor=red]; } 150 [label="Postponed exit from lambda"]; 151 [label="Postponed exit from lambda"]; @@ -470,7 +470,7 @@ digraph flowFromTwoInplaceLambdas_kt { 173 [label="Postponed enter to lambda"]; subgraph cluster_39 { color=blue - 174 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 174 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_40 { color=blue 175 [label="Enter block"]; @@ -482,11 +482,11 @@ digraph flowFromTwoInplaceLambdas_kt { 181 [label="Const: Int(123)"]; 182 [label="Exit block"]; } - 183 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 183 [label="Exit function " style="filled" fillcolor=red]; } subgraph cluster_41 { color=blue - 184 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 184 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_42 { color=blue 185 [label="Enter block"]; @@ -498,7 +498,7 @@ digraph flowFromTwoInplaceLambdas_kt { 191 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 192 [label="Exit block"]; } - 193 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 193 [label="Exit function " style="filled" fillcolor=red]; } 194 [label="Postponed exit from lambda"]; 195 [label="Postponed exit from lambda"]; @@ -566,7 +566,7 @@ digraph flowFromTwoInplaceLambdas_kt { 211 [label="Postponed enter to lambda"]; subgraph cluster_45 { color=blue - 212 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 212 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_46 { color=blue 213 [label="Enter block"]; @@ -575,11 +575,11 @@ digraph flowFromTwoInplaceLambdas_kt { 216 [label="Function call: R|/n|()" style="filled" fillcolor=yellow]; 217 [label="Exit block"]; } - 218 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 218 [label="Exit function " style="filled" fillcolor=red]; } subgraph cluster_47 { color=blue - 219 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 219 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_48 { color=blue 220 [label="Enter block"]; @@ -588,7 +588,7 @@ digraph flowFromTwoInplaceLambdas_kt { 223 [label="Const: Int(123)"]; 224 [label="Exit block"]; } - 225 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 225 [label="Exit function " style="filled" fillcolor=red]; } 226 [label="Postponed exit from lambda"]; 227 [label="Postponed exit from lambda"]; @@ -651,7 +651,7 @@ digraph flowFromTwoInplaceLambdas_kt { 242 [label="Postponed enter to lambda"]; subgraph cluster_51 { color=blue - 243 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 243 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_52 { color=blue 244 [label="Enter block"]; @@ -659,11 +659,11 @@ digraph flowFromTwoInplaceLambdas_kt { 246 [label="Access variable R|kotlin/String.length|"]; 247 [label="Exit block"]; } - 248 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 248 [label="Exit function " style="filled" fillcolor=red]; } subgraph cluster_53 { color=blue - 249 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 249 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_54 { color=blue 250 [label="Enter block"]; @@ -673,7 +673,7 @@ digraph flowFromTwoInplaceLambdas_kt { 254 [label="Access variable R|kotlin/String.length|"]; 255 [label="Exit block"]; } - 256 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 256 [label="Exit function " style="filled" fillcolor=red]; } 257 [label="Postponed exit from lambda"]; 258 [label="Postponed exit from lambda"]; @@ -723,7 +723,7 @@ digraph flowFromTwoInplaceLambdas_kt { 269 [label="Postponed enter to lambda"]; subgraph cluster_57 { color=blue - 270 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 270 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_58 { color=blue 271 [label="Enter block"]; @@ -731,11 +731,11 @@ digraph flowFromTwoInplaceLambdas_kt { 273 [label="Stub" style="filled" fillcolor=gray]; 274 [label="Exit block" style="filled" fillcolor=gray]; } - 275 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 275 [label="Exit function " style="filled" fillcolor=red]; } subgraph cluster_59 { color=blue - 276 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 276 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_60 { color=blue 277 [label="Enter block"]; @@ -743,7 +743,7 @@ digraph flowFromTwoInplaceLambdas_kt { 279 [label="Assignment: R|/y|"]; 280 [label="Exit block"]; } - 281 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 281 [label="Exit function " style="filled" fillcolor=red]; } 282 [label="Postponed exit from lambda"]; 283 [label="Postponed exit from lambda"]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.dot index 6bc3d707472..38552389b7b 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.dot @@ -38,7 +38,7 @@ digraph initBlockAndInPlaceLambda_kt { 13 [label="Postponed enter to lambda"]; subgraph cluster_6 { color=blue - 14 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 14 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_7 { color=blue 15 [label="Enter block"]; @@ -47,7 +47,7 @@ digraph initBlockAndInPlaceLambda_kt { 18 [label="Function call: R|/C.C|(...)" style="filled" fillcolor=yellow]; 19 [label="Exit block"]; } - 20 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 20 [label="Exit function " style="filled" fillcolor=red]; } 21 [label="Postponed exit from lambda"]; 22 [label="Function call: $subj$.R|kotlin/let|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot index f147376c5d1..bd56af553d7 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot @@ -62,14 +62,14 @@ digraph inplaceLambdaInControlFlowExpressions_kt { 24 [label="Postponed enter to lambda"]; subgraph cluster_9 { color=blue - 25 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 25 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_10 { color=blue 26 [label="Enter block"]; 27 [label="Function call: R|/materialize|()" style="filled" fillcolor=yellow]; 28 [label="Exit block"]; } - 29 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 29 [label="Exit function " style="filled" fillcolor=red]; } 30 [label="Postponed exit from lambda"]; 31 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -133,14 +133,14 @@ digraph inplaceLambdaInControlFlowExpressions_kt { 43 [label="Postponed enter to lambda"]; subgraph cluster_16 { color=blue - 44 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 44 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_17 { color=blue 45 [label="Enter block"]; 46 [label="Function call: R|/materialize|()" style="filled" fillcolor=yellow]; 47 [label="Exit block"]; } - 48 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 48 [label="Exit function " style="filled" fillcolor=red]; } 49 [label="Postponed exit from lambda"]; 50 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -204,14 +204,14 @@ digraph inplaceLambdaInControlFlowExpressions_kt { 65 [label="Postponed enter to lambda"]; subgraph cluster_22 { color=blue - 66 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 66 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_23 { color=blue 67 [label="Enter block"]; 68 [label="Function call: R|/materialize|()" style="filled" fillcolor=yellow]; 69 [label="Exit block"]; } - 70 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 70 [label="Exit function " style="filled" fillcolor=red]; } 71 [label="Postponed exit from lambda"]; 72 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot index a00c661b982..b96a9686290 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot @@ -194,7 +194,7 @@ digraph jumps_kt { } 73 [label="Exit loop block" style="filled" fillcolor=gray]; } - 74 [label="Exit whileloop"]; + 74 [label="Exit while loop"]; } 75 [label="Access variable R|/x|"]; 76 [label="Smart cast: R|/x|"]; @@ -254,7 +254,7 @@ digraph jumps_kt { 92 [label="Const: Boolean(true)" style="filled" fillcolor=gray]; 93 [label="Exit loop condition" style="filled" fillcolor=gray]; } - 94 [label="Exit do-whileloop"]; + 94 [label="Exit do-while loop"]; } 95 [label="Access variable R|/x|"]; 96 [label="Smart cast: R|/x|"]; @@ -331,7 +331,7 @@ digraph jumps_kt { } 121 [label="Exit loop block"]; } - 122 [label="Exit whileloop"]; + 122 [label="Exit while loop"]; } 123 [label="Exit block"]; } @@ -388,7 +388,7 @@ digraph jumps_kt { 132 [label="Postponed enter to lambda"]; subgraph cluster_39 { color=blue - 133 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 133 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_40 { color=blue 134 [label="Enter block"]; @@ -396,7 +396,7 @@ digraph jumps_kt { 136 [label="Stub" style="filled" fillcolor=gray]; 137 [label="Exit block" style="filled" fillcolor=gray]; } - 138 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 138 [label="Exit function " style="filled" fillcolor=red]; } 139 [label="Postponed exit from lambda"]; 140 [label="Function call: R|/run|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.dot index 425712e5358..d66c7b8c040 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.dot @@ -9,14 +9,14 @@ digraph lambdaAsReturnOfLambda_kt { 1 [label="Postponed enter to lambda"]; subgraph cluster_1 { color=blue - 2 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 2 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_2 { color=blue 3 [label="Enter block"]; 4 [label="Exit anonymous function expression"]; subgraph cluster_3 { color=blue - 5 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 5 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_4 { color=blue 6 [label="Enter block"]; @@ -24,7 +24,7 @@ digraph lambdaAsReturnOfLambda_kt { 8 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow]; 9 [label="Exit block"]; } - 10 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 10 [label="Exit function " style="filled" fillcolor=red]; } 11 [label="Jump: ^@run lambda@fun (foo: R|kotlin/String|): R|kotlin/Unit| { R|/bar|(R|/foo|) @@ -33,7 +33,7 @@ digraph lambdaAsReturnOfLambda_kt { 12 [label="Stub" style="filled" fillcolor=gray]; 13 [label="Exit block" style="filled" fillcolor=gray]; } - 14 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 14 [label="Exit function " style="filled" fillcolor=red]; } 15 [label="Postponed exit from lambda"]; 16 [label="Function call: R|/run| kotlin/Unit|>(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaReturningObject.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaReturningObject.dot index b89438469e5..7ffd207553a 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaReturningObject.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaReturningObject.dot @@ -80,14 +80,14 @@ digraph lambdaReturningObject_kt { 23 [label="Postponed enter to lambda"]; subgraph cluster_10 { color=blue - 24 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 24 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_11 { color=blue 25 [label="Enter block"]; 26 [label="Access qualifier /IrStarProjectionImpl"]; 27 [label="Exit block"]; } - 28 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 28 [label="Exit function " style="filled" fillcolor=red]; } 29 [label="Postponed exit from lambda"]; 30 [label="Function call: R|/MyOut|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.dot index d180f967d42..42e48f96b44 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.dot @@ -43,7 +43,7 @@ digraph lambdas_kt { 15 [label="Postponed enter to lambda"]; subgraph cluster_7 { color=blue - 16 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 16 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_8 { color=blue 17 [label="Enter block"]; @@ -52,7 +52,7 @@ digraph lambdas_kt { 20 [label="Function call: R|/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow]; 21 [label="Exit block"]; } - 22 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 22 [label="Exit function " style="filled" fillcolor=red]; } 23 [label="Postponed exit from lambda"]; 24 [label="Function call: R|/run|(...)" style="filled" fillcolor=yellow]; @@ -126,7 +126,7 @@ digraph lambdas_kt { } subgraph cluster_14 { color=blue - 47 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 47 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_15 { color=blue 48 [label="Enter block"]; @@ -135,7 +135,7 @@ digraph lambdas_kt { 51 [label="Function call: R|/x|.R|kotlin/Int.inc|()" style="filled" fillcolor=yellow]; 52 [label="Exit block"]; } - 53 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 53 [label="Exit function " style="filled" fillcolor=red]; } 30 -> {31}; 31 -> {32}; @@ -193,7 +193,7 @@ digraph lambdas_kt { 64 [label="Postponed enter to lambda"]; subgraph cluster_20 { color=blue - 65 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 65 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_21 { color=blue 66 [label="Enter block"]; @@ -202,7 +202,7 @@ digraph lambdas_kt { 69 [label="Stub" style="filled" fillcolor=gray]; 70 [label="Exit block" style="filled" fillcolor=gray]; } - 71 [label="Exit function anonymousFunction" style="filled" fillcolor=gray]; + 71 [label="Exit function " style="filled" fillcolor=gray]; } 72 [label="Postponed exit from lambda"]; 73 [label="Function call: R|/getInt|(...)" style="filled" fillcolor=yellow]; @@ -244,7 +244,7 @@ digraph lambdas_kt { 80 [label="Postponed enter to lambda"]; subgraph cluster_24 { color=blue - 81 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 81 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_25 { color=blue 82 [label="Enter block"]; @@ -253,7 +253,7 @@ digraph lambdas_kt { 85 [label="Stub" style="filled" fillcolor=gray]; 86 [label="Exit block" style="filled" fillcolor=gray]; } - 87 [label="Exit function anonymousFunction" style="filled" fillcolor=gray]; + 87 [label="Exit function " style="filled" fillcolor=gray]; } 88 [label="Postponed exit from lambda"]; 89 [label="Function call: R|/getInt|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot index 3bd002ec5b2..db1dc6c3d49 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot @@ -52,7 +52,7 @@ digraph localClassesWithImplicit_kt { 20 [label="Exit when branch result" style="filled" fillcolor=gray]; 21 [label="Exit when"]; } - 22 [label="Exit local class test"]; + 22 [label="Local class declaration"]; 23 [label="Enter anonymous object"]; subgraph cluster_7 { color=blue @@ -93,7 +93,7 @@ digraph localClassesWithImplicit_kt { 42 [label="Postponed enter to lambda"]; subgraph cluster_13 { color=blue - 43 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 43 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_14 { color=blue 44 [label="Enter block"]; @@ -105,7 +105,7 @@ digraph localClassesWithImplicit_kt { 50 [label="Function call: this@R|/|.R|/.baz|()" style="filled" fillcolor=yellow]; 51 [label="Exit block"]; } - 52 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 52 [label="Exit function " style="filled" fillcolor=red]; } 53 [label="Postponed exit from lambda"]; 54 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow]; @@ -129,7 +129,7 @@ digraph localClassesWithImplicit_kt { 61 [label="Postponed enter to lambda"]; subgraph cluster_17 { color=blue - 62 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 62 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_18 { color=blue 63 [label="Enter block"]; @@ -174,7 +174,7 @@ digraph localClassesWithImplicit_kt { } 88 [label="Exit block"]; } - 89 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 89 [label="Exit function " style="filled" fillcolor=red]; } 90 [label="Postponed exit from lambda"]; 91 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow]; @@ -230,7 +230,7 @@ digraph localClassesWithImplicit_kt { 110 [label="Postponed enter to lambda"]; subgraph cluster_30 { color=blue - 111 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 111 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_31 { color=blue 112 [label="Enter block"]; @@ -242,7 +242,7 @@ digraph localClassesWithImplicit_kt { 118 [label="Function call: this@R|/A|.R|/baz|()" style="filled" fillcolor=yellow]; 119 [label="Exit block"]; } - 120 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 120 [label="Exit function " style="filled" fillcolor=red]; } 121 [label="Postponed exit from lambda"]; 122 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow]; @@ -266,7 +266,7 @@ digraph localClassesWithImplicit_kt { 129 [label="Postponed enter to lambda"]; subgraph cluster_34 { color=blue - 130 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 130 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_35 { color=blue 131 [label="Enter block"]; @@ -311,7 +311,7 @@ digraph localClassesWithImplicit_kt { } 156 [label="Exit block"]; } - 157 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 157 [label="Exit function " style="filled" fillcolor=red]; } 158 [label="Postponed exit from lambda"]; 159 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/loops.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/loops.dot index 9609d333ea7..266d6f11186 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/loops.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/loops.dot @@ -31,7 +31,7 @@ digraph loops_kt { } 12 [label="Exit loop block"]; } - 13 [label="Exit whileloop"]; + 13 [label="Exit while loop"]; } 14 [label="Access variable R|/x|"]; 15 [label="Type operator: (R|/x| is R|kotlin/String|)"]; @@ -85,7 +85,7 @@ digraph loops_kt { 29 [label="Access variable R|/b|"]; 30 [label="Exit loop condition"]; } - 31 [label="Exit do-whileloop"]; + 31 [label="Exit do-while loop"]; } 32 [label="Access variable R|/x|"]; 33 [label="Type operator: (R|/x| is R|kotlin/String|)"]; @@ -152,7 +152,7 @@ digraph loops_kt { } 58 [label="Exit loop block"]; } - 59 [label="Exit whileloop"]; + 59 [label="Exit while loop"]; } 60 [label="Exit block"]; } @@ -217,7 +217,7 @@ digraph loops_kt { } 75 [label="Exit loop block"]; } - 76 [label="Exit whileloop" style="filled" fillcolor=gray]; + 76 [label="Exit while loop" style="filled" fillcolor=gray]; } 77 [label="Const: Int(1)" style="filled" fillcolor=gray]; 78 [label="Exit block" style="filled" fillcolor=gray]; @@ -286,7 +286,7 @@ digraph loops_kt { } 101 [label="Exit loop block"]; } - 102 [label="Exit whileloop"]; + 102 [label="Exit while loop"]; } 103 [label="Const: Int(1)"]; 104 [label="Exit block"]; @@ -347,7 +347,7 @@ digraph loops_kt { } 116 [label="Exit loop block" style="filled" fillcolor=gray]; } - 117 [label="Exit whileloop"]; + 117 [label="Exit while loop"]; } 118 [label="Const: Int(1)"]; 119 [label="Exit block"]; @@ -396,7 +396,7 @@ digraph loops_kt { 130 [label="Const: Boolean(true)"]; 131 [label="Exit loop condition"]; } - 132 [label="Exit do-whileloop" style="filled" fillcolor=gray]; + 132 [label="Exit do-while loop" style="filled" fillcolor=gray]; } 133 [label="Const: Int(1)" style="filled" fillcolor=gray]; 134 [label="Exit block" style="filled" fillcolor=gray]; @@ -465,7 +465,7 @@ digraph loops_kt { 156 [label="Const: Boolean(true)"]; 157 [label="Exit loop condition"]; } - 158 [label="Exit do-whileloop"]; + 158 [label="Exit do-while loop"]; } 159 [label="Const: Int(1)"]; 160 [label="Exit block"]; @@ -526,7 +526,7 @@ digraph loops_kt { 171 [label="Const: Boolean(false)"]; 172 [label="Exit loop condition"]; } - 173 [label="Exit do-whileloop"]; + 173 [label="Exit do-while loop"]; } 174 [label="Const: Int(1)"]; 175 [label="Exit block"]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.dot index 046e4138e92..6b424324b82 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.dot @@ -31,25 +31,25 @@ digraph postponedLambdaInConstructor_kt { 8 [label="Postponed enter to lambda"]; subgraph cluster_4 { color=blue - 9 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 9 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_5 { color=blue 10 [label="Enter block"]; 11 [label="Exit anonymous function expression"]; subgraph cluster_6 { color=blue - 12 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 12 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_7 { color=blue 13 [label="Enter block"]; 14 [label="Access variable R|/it|"]; 15 [label="Exit block"]; } - 16 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 16 [label="Exit function " style="filled" fillcolor=red]; } 17 [label="Exit block"]; } - 18 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 18 [label="Exit function " style="filled" fillcolor=red]; } 19 [label="Postponed exit from lambda"]; 20 [label="Function call: R|/s|.R|kotlin/let| kotlin/String|>(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInReturn.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInReturn.dot index 9ff8a360555..17320f73c45 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInReturn.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInReturn.dot @@ -75,7 +75,7 @@ digraph postponedLambdaInReturn_kt { 24 [label="Postponed enter to lambda"]; subgraph cluster_8 { color=blue - 25 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 25 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_9 { color=blue 26 [label="Enter block"]; @@ -110,7 +110,7 @@ digraph postponedLambdaInReturn_kt { 42 [label="Postponed enter to lambda"]; subgraph cluster_15 { color=blue - 43 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 43 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_16 { color=blue 44 [label="Enter block"]; @@ -120,7 +120,7 @@ digraph postponedLambdaInReturn_kt { 48 [label="Assignment: R|SubstitutionOverride|"]; 49 [label="Exit block"]; } - 50 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 50 [label="Exit function " style="filled" fillcolor=red]; } 51 [label="Postponed exit from lambda"]; 52 [label="Function call: R|/build|(...)" style="filled" fillcolor=yellow]; @@ -137,7 +137,7 @@ digraph postponedLambdaInReturn_kt { } 58 [label="Exit block" style="filled" fillcolor=gray]; } - 59 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 59 [label="Exit function " style="filled" fillcolor=red]; } 60 [label="Postponed exit from lambda"]; 61 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -210,7 +210,7 @@ digraph postponedLambdaInReturn_kt { 69 [label="Postponed enter to lambda"]; subgraph cluster_19 { color=blue - 70 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 70 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_20 { color=blue 71 [label="Enter block"]; @@ -241,7 +241,7 @@ digraph postponedLambdaInReturn_kt { 81 [label="Postponed enter to lambda"]; subgraph cluster_28 { color=blue - 82 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 82 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_29 { color=blue 83 [label="Enter block"]; @@ -249,7 +249,7 @@ digraph postponedLambdaInReturn_kt { 85 [label="Assignment: R|SubstitutionOverride|"]; 86 [label="Exit block"]; } - 87 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 87 [label="Exit function " style="filled" fillcolor=red]; } 88 [label="Postponed exit from lambda"]; 89 [label="Function call: R|/build|(...)" style="filled" fillcolor=yellow]; @@ -279,14 +279,14 @@ digraph postponedLambdaInReturn_kt { } 101 [label="Exit loop block"]; } - 102 [label="Exit whileloop" style="filled" fillcolor=gray]; + 102 [label="Exit while loop" style="filled" fillcolor=gray]; } 103 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=gray]; 104 [label="Throw: throw R|java/lang/Exception.Exception|()" style="filled" fillcolor=gray]; 105 [label="Stub" style="filled" fillcolor=gray]; 106 [label="Exit block" style="filled" fillcolor=gray]; } - 107 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 107 [label="Exit function " style="filled" fillcolor=red]; } 108 [label="Postponed exit from lambda"]; 109 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -363,7 +363,7 @@ digraph postponedLambdaInReturn_kt { 120 [label="Postponed enter to lambda"]; subgraph cluster_34 { color=blue - 121 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 121 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_35 { color=blue 122 [label="Enter block"]; @@ -399,7 +399,7 @@ digraph postponedLambdaInReturn_kt { 139 [label="Postponed enter to lambda"]; subgraph cluster_41 { color=blue - 140 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 140 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_42 { color=blue 141 [label="Enter block"]; @@ -409,7 +409,7 @@ digraph postponedLambdaInReturn_kt { 145 [label="Assignment: R|SubstitutionOverride|"]; 146 [label="Exit block"]; } - 147 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 147 [label="Exit function " style="filled" fillcolor=red]; } 148 [label="Postponed exit from lambda"]; 149 [label="Function call: R|/build|(...)" style="filled" fillcolor=yellow]; @@ -426,7 +426,7 @@ digraph postponedLambdaInReturn_kt { } 155 [label="Exit block" style="filled" fillcolor=gray]; } - 156 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 156 [label="Exit function " style="filled" fillcolor=red]; } 157 [label="Postponed exit from lambda"]; 158 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdas.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdas.dot index f3ca84ffb63..c74b5ebcb07 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdas.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdas.dot @@ -28,14 +28,14 @@ digraph postponedLambdas_kt { 8 [label="Postponed enter to lambda"]; subgraph cluster_4 { color=blue - 9 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 9 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_5 { color=blue 10 [label="Enter block"]; 11 [label="Const: String()"]; 12 [label="Exit block"]; } - 13 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 13 [label="Exit function " style="filled" fillcolor=red]; } 14 [label="Postponed exit from lambda"]; 15 [label="Function call: R|/foo|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot index e1145631fd2..5483384ea24 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot @@ -30,7 +30,7 @@ digraph propertiesAndInitBlocks_kt { subgraph cluster_3 { color=red - 8 [label="Enter function getter" style="filled" fillcolor=red]; + 8 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_4 { color=blue 9 [label="Enter block"]; @@ -39,7 +39,7 @@ digraph propertiesAndInitBlocks_kt { 12 [label="Stub" style="filled" fillcolor=gray]; 13 [label="Exit block" style="filled" fillcolor=gray]; } - 14 [label="Exit function getter" style="filled" fillcolor=red]; + 14 [label="Exit function " style="filled" fillcolor=red]; } 8 -> {9}; 9 -> {10}; @@ -51,7 +51,7 @@ digraph propertiesAndInitBlocks_kt { subgraph cluster_5 { color=red - 15 [label="Enter function setter" style="filled" fillcolor=red]; + 15 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_6 { color=blue 16 [label="Enter block"]; @@ -59,7 +59,7 @@ digraph propertiesAndInitBlocks_kt { 18 [label="Assignment: F|/x2|"]; 19 [label="Exit block"]; } - 20 [label="Exit function setter" style="filled" fillcolor=red]; + 20 [label="Exit function " style="filled" fillcolor=red]; } 15 -> {16}; 16 -> {17}; @@ -78,14 +78,14 @@ digraph propertiesAndInitBlocks_kt { subgraph cluster_8 { color=red - 24 [label="Enter function getter" style="filled" fillcolor=red]; + 24 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_9 { color=blue 25 [label="Enter block"]; - 26 [label="Exit local class "]; + 26 [label="Local class declaration"]; 27 [label="Exit block"]; } - 28 [label="Exit function getter" style="filled" fillcolor=red]; + 28 [label="Exit function " style="filled" fillcolor=red]; } subgraph cluster_10 { color=blue @@ -137,18 +137,18 @@ digraph propertiesAndInitBlocks_kt { 42 [label="Postponed enter to lambda"]; subgraph cluster_15 { color=blue - 43 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 43 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_16 { color=blue 44 [label="Enter block"]; - 45 [label="Local function declaration "]; - 46 [label="Exit local class "]; + 45 [label="Local function declaration"]; + 46 [label="Local class declaration"]; 47 [label="Function call: R|java/lang/Exception.Exception|()" style="filled" fillcolor=yellow]; 48 [label="Throw: throw R|java/lang/Exception.Exception|()"]; 49 [label="Stub" style="filled" fillcolor=gray]; 50 [label="Exit block" style="filled" fillcolor=gray]; } - 51 [label="Exit function anonymousFunction" style="filled" fillcolor=gray]; + 51 [label="Exit function " style="filled" fillcolor=gray]; } subgraph cluster_17 { color=blue diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/returnValuesFromLambda.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/returnValuesFromLambda.dot index 92345cd4971..f9d6f170793 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/returnValuesFromLambda.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/returnValuesFromLambda.dot @@ -55,7 +55,7 @@ digraph returnValuesFromLambda_kt { 14 [label="Postponed enter to lambda"]; subgraph cluster_7 { color=blue - 15 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 15 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_8 { color=blue 16 [label="Enter block"]; @@ -84,7 +84,7 @@ digraph returnValuesFromLambda_kt { 30 [label="Function call: R|/C.C|()" style="filled" fillcolor=yellow]; 31 [label="Exit block"]; } - 32 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 32 [label="Exit function " style="filled" fillcolor=red]; } 33 [label="Postponed exit from lambda"]; 34 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -131,7 +131,7 @@ digraph returnValuesFromLambda_kt { 40 [label="Postponed enter to lambda"]; subgraph cluster_14 { color=blue - 41 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 41 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_15 { color=blue 42 [label="Enter block"]; @@ -140,7 +140,7 @@ digraph returnValuesFromLambda_kt { 45 [label="Stub" style="filled" fillcolor=gray]; 46 [label="Exit block" style="filled" fillcolor=gray]; } - 47 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 47 [label="Exit function " style="filled" fillcolor=red]; } 48 [label="Postponed exit from lambda"]; 49 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -176,7 +176,7 @@ digraph returnValuesFromLambda_kt { 55 [label="Postponed enter to lambda"]; subgraph cluster_18 { color=blue - 56 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 56 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_19 { color=blue 57 [label="Enter block"]; @@ -184,7 +184,7 @@ digraph returnValuesFromLambda_kt { 59 [label="Stub" style="filled" fillcolor=gray]; 60 [label="Exit block" style="filled" fillcolor=gray]; } - 61 [label="Exit function anonymousFunction" style="filled" fillcolor=gray]; + 61 [label="Exit function " style="filled" fillcolor=gray]; } 62 [label="Postponed exit from lambda" style="filled" fillcolor=gray]; 63 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=gray]; diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/tryCatch.dot b/compiler/fir/analysis-tests/testData/resolve/cfg/tryCatch.dot index ace314275ae..5416c26a748 100644 --- a/compiler/fir/analysis-tests/testData/resolve/cfg/tryCatch.dot +++ b/compiler/fir/analysis-tests/testData/resolve/cfg/tryCatch.dot @@ -252,7 +252,7 @@ digraph tryCatch_kt { } 102 [label="Exit loop block"]; } - 103 [label="Exit whileloop"]; + 103 [label="Exit while loop"]; } 104 [label="Const: Int(3)"]; 105 [label="Variable declaration: lval z: R|kotlin/Int|"]; diff --git a/compiler/fir/analysis-tests/testData/resolve/classCallInLambda.dot b/compiler/fir/analysis-tests/testData/resolve/classCallInLambda.dot index abd814bcfd4..aeede79de74 100644 --- a/compiler/fir/analysis-tests/testData/resolve/classCallInLambda.dot +++ b/compiler/fir/analysis-tests/testData/resolve/classCallInLambda.dot @@ -13,7 +13,7 @@ digraph classCallInLambda_kt { 3 [label="Postponed enter to lambda"]; subgraph cluster_2 { color=blue - 4 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 4 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_3 { color=blue 5 [label="Enter block"]; @@ -21,7 +21,7 @@ digraph classCallInLambda_kt { 7 [label="::class call"]; 8 [label="Exit block"]; } - 9 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 9 [label="Exit function " style="filled" fillcolor=red]; } 10 [label="Postponed exit from lambda"]; 11 [label="Function call: R|/x|.R|kotlin/let||>(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot index 14d40ef87f0..9b8ff0dc393 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.dot @@ -95,7 +95,7 @@ digraph boundSmartcastsInBranches_kt { } 46 [label="Exit loop block"]; } - 47 [label="Exit whileloop"]; + 47 [label="Exit while loop"]; } 48 [label="Exit block"]; } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.dot index ff884934705..bc823db480d 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.dot @@ -429,7 +429,7 @@ digraph returns_kt { subgraph cluster_38 { color=red - 152 [label="Enter function getter" style="filled" fillcolor=red]; + 152 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_39 { color=blue 153 [label="Enter block"]; @@ -438,7 +438,7 @@ digraph returns_kt { 156 [label="Stub" style="filled" fillcolor=gray]; 157 [label="Exit block" style="filled" fillcolor=gray]; } - 158 [label="Exit function getter" style="filled" fillcolor=red]; + 158 [label="Exit function " style="filled" fillcolor=red]; } 152 -> {153}; 153 -> {154}; @@ -471,7 +471,7 @@ digraph returns_kt { 175 [label="Postponed enter to lambda"]; subgraph cluster_42 { color=blue - 176 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 176 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_43 { color=blue 177 [label="Enter block"]; @@ -480,7 +480,7 @@ digraph returns_kt { 180 [label="Access variable R|kotlin/String.length|"]; 181 [label="Exit block"]; } - 182 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 182 [label="Exit function " style="filled" fillcolor=red]; } 183 [label="Postponed exit from lambda"]; 184 [label="Function call: R|/runHigherOrder|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/incorrectSmartcastToNothing.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/incorrectSmartcastToNothing.dot index 215d1bc426d..dbb309c6dac 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/incorrectSmartcastToNothing.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/incorrectSmartcastToNothing.dot @@ -71,7 +71,7 @@ digraph incorrectSmartcastToNothing_kt { 35 [label="Postponed enter to lambda"]; subgraph cluster_10 { color=blue - 36 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 36 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_11 { color=blue 37 [label="Enter block"]; @@ -80,7 +80,7 @@ digraph incorrectSmartcastToNothing_kt { 40 [label="Function call: R|java/io/File.File|(...)" style="filled" fillcolor=yellow]; 41 [label="Exit block"]; } - 42 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 42 [label="Exit function " style="filled" fillcolor=red]; } 43 [label="Postponed exit from lambda"]; 44 [label="Function call: $subj$.R|kotlin/let|(...)" style="filled" fillcolor=yellow]; 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 2d6a0c14eb8..47441f0fa56 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.dot @@ -57,7 +57,7 @@ digraph inPlaceLambdas_kt { 18 [label="Postponed enter to lambda"]; subgraph cluster_9 { color=blue - 19 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 19 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_10 { color=blue 20 [label="Enter block"]; @@ -66,7 +66,7 @@ digraph inPlaceLambdas_kt { 23 [label="Function call: R|/x|.R|/A.foo|()" style="filled" fillcolor=yellow]; 24 [label="Exit block"]; } - 25 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 25 [label="Exit function " style="filled" fillcolor=red]; } 26 [label="Postponed exit from lambda"]; 27 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -115,7 +115,7 @@ digraph inPlaceLambdas_kt { 35 [label="Postponed enter to lambda"]; subgraph cluster_13 { color=blue - 36 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 36 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_14 { color=blue 37 [label="Enter block"]; @@ -123,7 +123,7 @@ digraph inPlaceLambdas_kt { 39 [label="Type operator: (R|/x| as R|B|)"]; 40 [label="Exit block"]; } - 41 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 41 [label="Exit function " style="filled" fillcolor=red]; } 42 [label="Postponed exit from lambda"]; 43 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -176,7 +176,7 @@ digraph inPlaceLambdas_kt { 59 [label="Postponed enter to lambda"]; subgraph cluster_20 { color=blue - 60 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 60 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_21 { color=blue 61 [label="Enter block"]; @@ -188,7 +188,7 @@ digraph inPlaceLambdas_kt { 67 [label="Type operator: (R|/x| as R|B|)"]; 68 [label="Exit block"]; } - 69 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 69 [label="Exit function " style="filled" fillcolor=red]; } 70 [label="Postponed exit from lambda"]; 71 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/lambdaInWhenBranch.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/lambdaInWhenBranch.dot index b33ea9cbd8f..5ec9456316e 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/lambdaInWhenBranch.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/lambdaInWhenBranch.dot @@ -142,14 +142,14 @@ digraph lambdaInWhenBranch_kt { 49 [label="Postponed enter to lambda"]; subgraph cluster_18 { color=blue - 50 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 50 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_19 { color=blue 51 [label="Enter block"]; 52 [label="Access variable R|/it|"]; 53 [label="Exit block"]; } - 54 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 54 [label="Exit function " style="filled" fillcolor=red]; } 55 [label="Postponed exit from lambda"]; 56 [label="Function call: String().R|kotlin/let|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/dataFlowInfoFromWhileCondition.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/dataFlowInfoFromWhileCondition.dot index 3f7e1ac5775..ce2b60c386a 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/dataFlowInfoFromWhileCondition.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/dataFlowInfoFromWhileCondition.dot @@ -72,7 +72,7 @@ digraph dataFlowInfoFromWhileCondition_kt { } 29 [label="Exit loop block"]; } - 30 [label="Exit whileloop"]; + 30 [label="Exit while loop"]; } 31 [label="Exit block"]; } diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/endlessLoops.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/endlessLoops.dot index 747ab14808b..fae481577e8 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/endlessLoops.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/endlessLoops.dot @@ -66,7 +66,7 @@ digraph endlessLoops_kt { } 27 [label="Exit loop block"]; } - 28 [label="Exit whileloop"]; + 28 [label="Exit while loop"]; } 29 [label="Access variable R|/x|"]; 30 [label="Smart cast: R|/x|"]; @@ -155,7 +155,7 @@ digraph endlessLoops_kt { } 57 [label="Exit loop block"]; } - 58 [label="Exit whileloop"]; + 58 [label="Exit while loop"]; } 59 [label="Access variable R|/x|"]; 60 [label="Smart cast: R|/x|"]; @@ -265,7 +265,7 @@ digraph endlessLoops_kt { } 99 [label="Exit loop block"]; } - 100 [label="Exit whileloop"]; + 100 [label="Exit while loop"]; } 101 [label="Access variable R|/x|"]; 102 [label="Smart cast: R|/x|"]; @@ -369,7 +369,7 @@ digraph endlessLoops_kt { } 131 [label="Exit loop block" style="filled" fillcolor=gray]; } - 132 [label="Exit whileloop"]; + 132 [label="Exit while loop"]; } 133 [label="Access variable R|/x|"]; 134 [label="Function call: R|/x|.#()" style="filled" fillcolor=yellow]; @@ -459,7 +459,7 @@ digraph endlessLoops_kt { 159 [label="Const: Boolean(true)"]; 160 [label="Exit loop condition"]; } - 161 [label="Exit do-whileloop"]; + 161 [label="Exit do-while loop"]; } 162 [label="Access variable R|/x|"]; 163 [label="Smart cast: R|/x|"]; @@ -548,7 +548,7 @@ digraph endlessLoops_kt { 189 [label="Const: Boolean(true)"]; 190 [label="Exit loop condition"]; } - 191 [label="Exit do-whileloop"]; + 191 [label="Exit do-while loop"]; } 192 [label="Access variable R|/x|"]; 193 [label="Smart cast: R|/x|"]; @@ -616,7 +616,7 @@ digraph endlessLoops_kt { 207 [label="Const: Boolean(true)"]; 208 [label="Exit loop condition"]; } - 209 [label="Exit do-whileloop" style="filled" fillcolor=gray]; + 209 [label="Exit do-while loop" style="filled" fillcolor=gray]; } 210 [label="Access variable R|/x|" style="filled" fillcolor=gray]; 211 [label="Smart cast: R|/x|" style="filled" fillcolor=gray]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.dot index fd6e2268a1c..bade8c1ebfd 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.dot @@ -178,7 +178,7 @@ digraph nullability_kt { } subgraph cluster_21 { color=blue - 56 [label="Enter function getter" style="filled" fillcolor=red]; + 56 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_22 { color=blue 57 [label="Enter block"]; @@ -187,7 +187,7 @@ digraph nullability_kt { 60 [label="Stub" style="filled" fillcolor=gray]; 61 [label="Exit block" style="filled" fillcolor=gray]; } - 62 [label="Exit function getter" style="filled" fillcolor=red]; + 62 [label="Exit function " style="filled" fillcolor=red]; } 44 -> {45} [color=green]; 44 -> {48} [style=dotted]; 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 9b4be191d87..f1df69a831d 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceivers.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceivers.dot @@ -255,7 +255,7 @@ digraph implicitReceivers_kt { 85 [label="Postponed enter to lambda"]; subgraph cluster_26 { color=blue - 86 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 86 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_27 { color=blue 87 [label="Enter block"]; @@ -263,7 +263,7 @@ digraph implicitReceivers_kt { 89 [label="Postponed enter to lambda"]; subgraph cluster_28 { color=blue - 90 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 90 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_29 { color=blue 91 [label="Enter block"]; @@ -271,7 +271,7 @@ digraph implicitReceivers_kt { 93 [label="Postponed enter to lambda"]; subgraph cluster_30 { color=blue - 94 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 94 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_31 { color=blue 95 [label="Enter block"]; @@ -283,7 +283,7 @@ digraph implicitReceivers_kt { 101 [label="Function call: this@R|special/anonymous|.R|/A.foo|()" style="filled" fillcolor=yellow]; 102 [label="Exit block"]; } - 103 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 103 [label="Exit function " style="filled" fillcolor=red]; } 104 [label="Postponed exit from lambda"]; 105 [label="Function call: R|kotlin/with|(...)" style="filled" fillcolor=yellow]; @@ -293,13 +293,13 @@ digraph implicitReceivers_kt { 109 [label="Function call: this@R|special/anonymous|.R|/A.foo|()" style="filled" fillcolor=yellow]; 110 [label="Exit block"]; } - 111 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 111 [label="Exit function " style="filled" fillcolor=red]; } 112 [label="Postponed exit from lambda"]; 113 [label="Function call: R|kotlin/with|(...)" style="filled" fillcolor=yellow]; 114 [label="Exit block"]; } - 115 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 115 [label="Exit function " style="filled" fillcolor=red]; } 116 [label="Postponed exit from lambda"]; 117 [label="Function call: R|kotlin/with|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/thisOfExtensionProperty.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/thisOfExtensionProperty.dot index 7e7f9fcfaf6..81c1f3997be 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/thisOfExtensionProperty.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/thisOfExtensionProperty.dot @@ -19,7 +19,7 @@ digraph thisOfExtensionProperty_kt { subgraph cluster_2 { color=red - 4 [label="Enter function getter" style="filled" fillcolor=red]; + 4 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_3 { color=blue 5 [label="Enter block"]; @@ -37,7 +37,7 @@ digraph thisOfExtensionProperty_kt { 14 [label="Stub" style="filled" fillcolor=gray]; 15 [label="Exit block" style="filled" fillcolor=gray]; } - 16 [label="Exit function getter" style="filled" fillcolor=red]; + 16 [label="Exit function " style="filled" fillcolor=red]; } 4 -> {5}; 5 -> {6}; @@ -55,7 +55,7 @@ digraph thisOfExtensionProperty_kt { subgraph cluster_5 { color=red - 17 [label="Enter function getter" style="filled" fillcolor=red]; + 17 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_6 { color=blue 18 [label="Enter block"]; @@ -75,7 +75,7 @@ digraph thisOfExtensionProperty_kt { 29 [label="Stub" style="filled" fillcolor=gray]; 30 [label="Exit block" style="filled" fillcolor=gray]; } - 31 [label="Exit function getter" style="filled" fillcolor=red]; + 31 [label="Exit function " style="filled" fillcolor=red]; } 17 -> {18}; 18 -> {19}; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.dot index e3ecaad9a75..63af2355045 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.dot @@ -150,7 +150,7 @@ digraph safeCalls_kt { 59 [label="Postponed enter to lambda"]; subgraph cluster_14 { color=blue - 60 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 60 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_15 { color=blue 61 [label="Enter block"]; @@ -159,7 +159,7 @@ digraph safeCalls_kt { 64 [label="Function call: R|/x|.R|/A.bool|()" style="filled" fillcolor=yellow]; 65 [label="Exit block"]; } - 66 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 66 [label="Exit function " style="filled" fillcolor=red]; } 67 [label="Postponed exit from lambda"]; 68 [label="Function call: $subj$.R|/let|(...)" style="filled" fillcolor=yellow]; @@ -260,7 +260,7 @@ digraph safeCalls_kt { 97 [label="Postponed enter to lambda"]; subgraph cluster_22 { color=blue - 98 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 98 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_23 { color=blue 99 [label="Enter block"]; @@ -268,7 +268,7 @@ digraph safeCalls_kt { 101 [label="Stub" style="filled" fillcolor=gray]; 102 [label="Exit block" style="filled" fillcolor=gray]; } - 103 [label="Exit function anonymousFunction" style="filled" fillcolor=gray]; + 103 [label="Exit function " style="filled" fillcolor=gray]; } 104 [label="Postponed exit from lambda" style="filled" fillcolor=gray]; 105 [label="Function call: $subj$.R|kotlin/let|(...)" style="filled" fillcolor=gray]; diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot index 80c2ca7461f..9e85d778d42 100644 --- a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot +++ b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.dot @@ -50,7 +50,7 @@ digraph smartcastToNothing_kt { subgraph cluster_4 { color=red - 16 [label="Enter function getter" style="filled" fillcolor=red]; + 16 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_5 { color=blue 17 [label="Enter block"]; @@ -59,7 +59,7 @@ digraph smartcastToNothing_kt { 20 [label="Stub" style="filled" fillcolor=gray]; 21 [label="Exit block" style="filled" fillcolor=gray]; } - 22 [label="Exit function getter" style="filled" fillcolor=red]; + 22 [label="Exit function " style="filled" fillcolor=red]; } 16 -> {17}; 17 -> {18}; @@ -71,7 +71,7 @@ digraph smartcastToNothing_kt { subgraph cluster_6 { color=red - 23 [label="Enter function getter" style="filled" fillcolor=red]; + 23 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_7 { color=blue 24 [label="Enter block"]; @@ -80,7 +80,7 @@ digraph smartcastToNothing_kt { 27 [label="Stub" style="filled" fillcolor=gray]; 28 [label="Exit block" style="filled" fillcolor=gray]; } - 29 [label="Exit function getter" style="filled" fillcolor=red]; + 29 [label="Exit function " style="filled" fillcolor=red]; } 23 -> {24}; 24 -> {25}; @@ -214,7 +214,7 @@ digraph smartcastToNothing_kt { } 87 [label="Exit loop block" style="filled" fillcolor=gray]; } - 88 [label="Exit whileloop"]; + 88 [label="Exit while loop"]; } 89 [label="Exit block"]; } @@ -223,7 +223,7 @@ digraph smartcastToNothing_kt { 92 [label="Postponed enter to lambda"]; subgraph cluster_24 { color=blue - 93 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 93 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_25 { color=blue 94 [label="Enter block"]; @@ -231,7 +231,7 @@ digraph smartcastToNothing_kt { 96 [label="Access variable R|/A.a|"]; 97 [label="Exit block"]; } - 98 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 98 [label="Exit function " style="filled" fillcolor=red]; } 99 [label="Postponed exit from lambda"]; 100 [label="Function call: $subj$.R|kotlin/let|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot index 7b2eb42cde7..26fd9b3762e 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.dot @@ -29,14 +29,14 @@ digraph complexPostponedCfg_kt { 9 [label="Postponed enter to lambda"]; subgraph cluster_4 { color=blue - 10 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 10 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_5 { color=blue 11 [label="Enter block"]; 12 [label="Postponed enter to lambda"]; subgraph cluster_6 { color=blue - 13 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 13 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_7 { color=blue 14 [label="Enter block"]; @@ -48,7 +48,7 @@ digraph complexPostponedCfg_kt { 20 [label="Postponed enter to lambda"]; subgraph cluster_8 { color=blue - 21 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 21 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_9 { color=blue 22 [label="Enter block"]; @@ -59,19 +59,19 @@ digraph complexPostponedCfg_kt { 27 [label="Function call: this@R|special/anonymous|.R|SubstitutionOverride|(...)" style="filled" fillcolor=yellow]; 28 [label="Exit block"]; } - 29 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 29 [label="Exit function " style="filled" fillcolor=red]; } 30 [label="Postponed exit from lambda"]; 31 [label="Function call: R|kotlin/with|(...)" style="filled" fillcolor=yellow]; 32 [label="Exit block"]; } - 33 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 33 [label="Exit function " style="filled" fillcolor=red]; } 34 [label="Postponed exit from lambda"]; 35 [label="Function call: R|kotlin/collections/buildList|(...)" style="filled" fillcolor=yellow]; 36 [label="Exit block"]; } - 37 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 37 [label="Exit function " style="filled" fillcolor=red]; } 38 [label="Postponed exit from lambda"]; 39 [label="Function call: R|kotlin/with||>(...)" style="filled" fillcolor=yellow]; 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 84a04d1b2f9..3ae223c6c5d 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.dot @@ -13,7 +13,7 @@ digraph callsInPlace_kt { 3 [label="Postponed enter to lambda"]; subgraph cluster_2 { color=blue - 4 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 4 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_3 { color=blue 5 [label="Enter block"]; @@ -21,7 +21,7 @@ digraph callsInPlace_kt { 7 [label="Assignment: R|/x|"]; 8 [label="Exit block"]; } - 9 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 9 [label="Exit function " style="filled" fillcolor=red]; } 10 [label="Postponed exit from lambda"]; 11 [label="Function call: R|kotlin/run|(...)" style="filled" fillcolor=yellow]; @@ -59,14 +59,14 @@ digraph callsInPlace_kt { 19 [label="Postponed enter to lambda"]; subgraph cluster_6 { color=blue - 20 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 20 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_7 { color=blue 21 [label="Enter block"]; 22 [label="Const: String(test_2)"]; 23 [label="Exit block"]; } - 24 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 24 [label="Exit function " style="filled" fillcolor=red]; } 25 [label="Postponed exit from lambda"]; 26 [label="Function call: R|kotlin/repeat|(...)" style="filled" fillcolor=yellow]; @@ -99,14 +99,14 @@ digraph callsInPlace_kt { 32 [label="Postponed enter to lambda"]; subgraph cluster_10 { color=blue - 33 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 33 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_11 { color=blue 34 [label="Enter block"]; 35 [label="Const: String(test_3)"]; 36 [label="Exit block"]; } - 37 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 37 [label="Exit function " style="filled" fillcolor=red]; } 38 [label="Postponed exit from lambda"]; 39 [label="Function call: R|kotlin/repeat|(...)" style="filled" fillcolor=yellow]; @@ -139,7 +139,7 @@ digraph callsInPlace_kt { 45 [label="Postponed enter to lambda"]; subgraph cluster_14 { color=blue - 46 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 46 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_15 { color=blue 47 [label="Enter block"]; @@ -150,7 +150,7 @@ digraph callsInPlace_kt { 52 [label="Comparison >"]; 53 [label="Exit block"]; } - 54 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 54 [label="Exit function " style="filled" fillcolor=red]; } 55 [label="Postponed exit from lambda"]; 56 [label="Function call: Int(1).R|kotlin/takeUnless|(...)" style="filled" fillcolor=yellow]; @@ -187,7 +187,7 @@ digraph callsInPlace_kt { 62 [label="Postponed enter to lambda"]; subgraph cluster_18 { color=blue - 63 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 63 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_19 { color=blue 64 [label="Enter block"]; @@ -198,7 +198,7 @@ digraph callsInPlace_kt { 69 [label="Comparison >"]; 70 [label="Exit block"]; } - 71 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 71 [label="Exit function " style="filled" fillcolor=red]; } 72 [label="Postponed exit from lambda"]; 73 [label="Function call: Int(1).R|kotlin/takeUnless|(...)" style="filled" fillcolor=yellow]; @@ -252,25 +252,25 @@ digraph callsInPlace_kt { 84 [label="Postponed enter to lambda"]; subgraph cluster_24 { color=blue - 85 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 85 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_25 { color=blue 86 [label="Enter block"]; 87 [label="Const: String(test_6_2)"]; 88 [label="Exit block"]; } - 89 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 89 [label="Exit function " style="filled" fillcolor=red]; } subgraph cluster_26 { color=blue - 90 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 90 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_27 { color=blue 91 [label="Enter block"]; 92 [label="Const: String(test_6_1)"]; 93 [label="Exit block"]; } - 94 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 94 [label="Exit function " style="filled" fillcolor=red]; } 95 [label="Postponed exit from lambda"]; 96 [label="Postponed exit from lambda"]; @@ -309,25 +309,25 @@ digraph callsInPlace_kt { 102 [label="Postponed enter to lambda"]; subgraph cluster_30 { color=blue - 103 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 103 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_31 { color=blue 104 [label="Enter block"]; 105 [label="Const: String(test_7_1)"]; 106 [label="Exit block"]; } - 107 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 107 [label="Exit function " style="filled" fillcolor=red]; } subgraph cluster_32 { color=blue - 108 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 108 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_33 { color=blue 109 [label="Enter block"]; 110 [label="Const: String(test_7_2)"]; 111 [label="Exit block"]; } - 112 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 112 [label="Exit function " style="filled" fillcolor=red]; } 113 [label="Postponed exit from lambda"]; 114 [label="Postponed exit from lambda"]; @@ -382,14 +382,14 @@ digraph callsInPlace_kt { 125 [label="Postponed enter to lambda"]; subgraph cluster_38 { color=blue - 126 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 126 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_39 { color=blue 127 [label="Enter block"]; 128 [label="Const: String(test_8)"]; 129 [label="Exit block"]; } - 130 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 130 [label="Exit function " style="filled" fillcolor=red]; } 131 [label="Postponed exit from lambda"]; 132 [label="Function call: R|/myDummyRun|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot index 08caaf927a5..a1614587594 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.dot @@ -14,7 +14,7 @@ digraph inLocalClass_kt { 2 [label="Enter block"]; 3 [label="Exit block"]; } - 4 [label="Exit local class foo"]; + 4 [label="Local class declaration"]; 5 [label="Function call: R|/LocalClass.LocalClass|()" style="filled" fillcolor=yellow]; 6 [label="Function call: R|/LocalClass.LocalClass|().R|/run|()" style="filled" fillcolor=yellow]; 7 [label="Function call: R|/e|.R|SubstitutionOverride|()" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.dot index 8293b137d84..a1b83543e99 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.dot @@ -14,7 +14,7 @@ digraph inLocalFunction_kt { 2 [label="Enter block"]; 3 [label="Exit block"]; } - 4 [label="Local function declaration foo"]; + 4 [label="Local function declaration"]; 5 [label="Function call: R|/localFun|()" style="filled" fillcolor=yellow]; 6 [label="Function call: R|/b|.R|SubstitutionOverride|()" style="filled" fillcolor=yellow]; 7 [label="Exit block"]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.dot index 9241c12104c..de8d00432c9 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.dot @@ -59,7 +59,7 @@ digraph atLeastOnce_kt { 17 [label="Postponed enter to lambda"]; subgraph cluster_8 { color=blue - 18 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 18 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_9 { color=blue 19 [label="Enter block"]; @@ -67,7 +67,7 @@ digraph atLeastOnce_kt { 21 [label="Assignment: R|/x|"]; 22 [label="Exit block"]; } - 23 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 23 [label="Exit function " style="filled" fillcolor=red]; } 24 [label="Postponed exit from lambda"]; 25 [label="Function call: R|/inlineRun|(...)" style="filled" fillcolor=yellow]; @@ -106,7 +106,7 @@ digraph atLeastOnce_kt { 33 [label="Postponed enter to lambda"]; subgraph cluster_12 { color=blue - 34 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 34 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_13 { color=blue 35 [label="Enter block"]; @@ -114,7 +114,7 @@ digraph atLeastOnce_kt { 37 [label="Assignment: R|/x|"]; 38 [label="Exit block"]; } - 39 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 39 [label="Exit function " style="filled" fillcolor=red]; } 40 [label="Postponed exit from lambda"]; 41 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.dot index 26385496d2c..57ebcdff91f 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.dot @@ -59,7 +59,7 @@ digraph atMostOnce_kt { 17 [label="Postponed enter to lambda"]; subgraph cluster_8 { color=blue - 18 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 18 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_9 { color=blue 19 [label="Enter block"]; @@ -67,7 +67,7 @@ digraph atMostOnce_kt { 21 [label="Assignment: R|/x|"]; 22 [label="Exit block"]; } - 23 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 23 [label="Exit function " style="filled" fillcolor=red]; } 24 [label="Postponed exit from lambda"]; 25 [label="Function call: R|/inlineRun|(...)" style="filled" fillcolor=yellow]; @@ -104,7 +104,7 @@ digraph atMostOnce_kt { 33 [label="Postponed enter to lambda"]; subgraph cluster_12 { color=blue - 34 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 34 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_13 { color=blue 35 [label="Enter block"]; @@ -112,7 +112,7 @@ digraph atMostOnce_kt { 37 [label="Assignment: R|/x|"]; 38 [label="Exit block"]; } - 39 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 39 [label="Exit function " style="filled" fillcolor=red]; } 40 [label="Postponed exit from lambda"]; 41 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow]; 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 a94af9bb951..04646548112 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 @@ -59,7 +59,7 @@ digraph exactlyOnce_kt { 17 [label="Postponed enter to lambda"]; subgraph cluster_8 { color=blue - 18 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 18 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_9 { color=blue 19 [label="Enter block"]; @@ -67,7 +67,7 @@ digraph exactlyOnce_kt { 21 [label="Assignment: R|/x|"]; 22 [label="Exit block"]; } - 23 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 23 [label="Exit function " style="filled" fillcolor=red]; } 24 [label="Postponed exit from lambda"]; 25 [label="Function call: R|/inlineRun|(...)" style="filled" fillcolor=yellow]; @@ -105,7 +105,7 @@ digraph exactlyOnce_kt { 33 [label="Postponed enter to lambda"]; subgraph cluster_12 { color=blue - 34 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 34 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_13 { color=blue 35 [label="Enter block"]; @@ -113,7 +113,7 @@ digraph exactlyOnce_kt { 37 [label="Assignment: R|/x|"]; 38 [label="Exit block"]; } - 39 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 39 [label="Exit function " style="filled" fillcolor=red]; } 40 [label="Postponed exit from lambda"]; 41 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.dot index cdb6bdf2afc..993aeebaec2 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.dot @@ -173,7 +173,7 @@ digraph flow_kt { } 80 [label="Exit loop block"]; } - 81 [label="Exit whileloop"]; + 81 [label="Exit while loop"]; } 82 [label="Exit block"]; } @@ -205,7 +205,7 @@ digraph flow_kt { 96 [label="Const: Boolean(true)"]; 97 [label="Exit loop condition"]; } - 98 [label="Exit do-whileloop" style="filled" fillcolor=gray]; + 98 [label="Exit do-while loop" style="filled" fillcolor=gray]; } 99 [label="Exit block" style="filled" fillcolor=gray]; } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.dot index d8a07585131..b7594edc10d 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.dot @@ -70,14 +70,14 @@ digraph inPlaceLambda_kt { 22 [label="Postponed enter to lambda"]; subgraph cluster_9 { color=blue - 23 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 23 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_10 { color=blue 24 [label="Enter block"]; 25 [label="Function call: R|/x|.R|SubstitutionOverride|()" style="filled" fillcolor=yellow]; 26 [label="Exit block"]; } - 27 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 27 [label="Exit function " style="filled" fillcolor=red]; } 28 [label="Postponed exit from lambda"]; 29 [label="Function call: R|/bar|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.dot index 28cd3a724c0..84ae97b65b1 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.dot @@ -59,7 +59,7 @@ digraph unknown_kt { 17 [label="Postponed enter to lambda"]; subgraph cluster_8 { color=blue - 18 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 18 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_9 { color=blue 19 [label="Enter block"]; @@ -67,7 +67,7 @@ digraph unknown_kt { 21 [label="Assignment: R|/x|"]; 22 [label="Exit block"]; } - 23 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 23 [label="Exit function " style="filled" fillcolor=red]; } 24 [label="Postponed exit from lambda"]; 25 [label="Function call: R|/inlineRun|(...)" style="filled" fillcolor=yellow]; @@ -105,7 +105,7 @@ digraph unknown_kt { 33 [label="Postponed enter to lambda"]; subgraph cluster_12 { color=blue - 34 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 34 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_13 { color=blue 35 [label="Enter block"]; @@ -113,7 +113,7 @@ digraph unknown_kt { 37 [label="Assignment: R|/x|"]; 38 [label="Exit block"]; } - 39 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 39 [label="Exit function " style="filled" fillcolor=red]; } 40 [label="Postponed exit from lambda"]; 41 [label="Function call: R|/myRun|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot index b7dbb983a69..fe0e7a91539 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.dot @@ -93,7 +93,7 @@ digraph delegateWithAnonymousObject_kt { 28 [label="Postponed enter to lambda"]; subgraph cluster_11 { color=blue - 29 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 29 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_12 { color=blue 30 [label="Enter block"]; @@ -112,7 +112,7 @@ digraph delegateWithAnonymousObject_kt { 37 [label="Exit anonymous object expression"]; 38 [label="Exit block"]; } - 39 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 39 [label="Exit function " style="filled" fillcolor=red]; } subgraph cluster_15 { color=blue @@ -153,7 +153,7 @@ digraph delegateWithAnonymousObject_kt { } subgraph cluster_19 { color=blue - 63 [label="Enter function setter" style="filled" fillcolor=red]; + 63 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_20 { color=blue 64 [label="Enter block"]; @@ -163,11 +163,11 @@ digraph delegateWithAnonymousObject_kt { 68 [label="Function call: this@R|/IssuesListUserProfile|.D|/IssuesListUserProfile.issueListView|.R|SubstitutionOverride|(...)" style="filled" fillcolor=yellow]; 69 [label="Exit block"]; } - 70 [label="Exit function setter" style="filled" fillcolor=red]; + 70 [label="Exit function " style="filled" fillcolor=red]; } subgraph cluster_21 { color=blue - 71 [label="Enter function getter" style="filled" fillcolor=red]; + 71 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_22 { color=blue 72 [label="Enter block"]; @@ -178,7 +178,7 @@ digraph delegateWithAnonymousObject_kt { 77 [label="Stub" style="filled" fillcolor=gray]; 78 [label="Exit block" style="filled" fillcolor=gray]; } - 79 [label="Exit function getter" style="filled" fillcolor=red]; + 79 [label="Exit function " style="filled" fillcolor=red]; } 23 -> {24} [color=green]; 23 -> {62} [style=dotted]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.dot index 6d7b8f586a4..091f8aae708 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.dot @@ -17,14 +17,14 @@ digraph plusAssignWithLambdaInRhs_kt { 7 [label="Postponed enter to lambda" style="filled" fillcolor=gray]; subgraph cluster_2 { color=blue - 8 [label="Enter function anonymousFunction" style="filled" fillcolor=gray]; + 8 [label="Enter function " style="filled" fillcolor=gray]; subgraph cluster_3 { color=blue 9 [label="Enter block" style="filled" fillcolor=gray]; 10 [label="Access variable R|/it|" style="filled" fillcolor=gray]; 11 [label="Exit block" style="filled" fillcolor=gray]; } - 12 [label="Exit function anonymousFunction" style="filled" fillcolor=gray]; + 12 [label="Exit function " style="filled" fillcolor=gray]; } 13 [label="Postponed exit from lambda" style="filled" fillcolor=gray]; 14 [label="Function call: R|/list|.R|kotlin/collections/plusAssign| kotlin/String|>(...)" style="filled" fillcolor=gray]; @@ -87,7 +87,7 @@ digraph plusAssignWithLambdaInRhs_kt { 29 [label="Postponed enter to lambda"]; subgraph cluster_9 { color=blue - 30 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 30 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_10 { color=blue 31 [label="Enter block"]; @@ -95,7 +95,7 @@ digraph plusAssignWithLambdaInRhs_kt { 33 [label="Postponed enter to lambda"]; subgraph cluster_11 { color=blue - 34 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 34 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_12 { color=blue 35 [label="Enter block"]; @@ -103,13 +103,13 @@ digraph plusAssignWithLambdaInRhs_kt { 37 [label="Function call: R|/resolve|.R|SubstitutionOverride|(...)" style="filled" fillcolor=yellow]; 38 [label="Exit block"]; } - 39 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 39 [label="Exit function " style="filled" fillcolor=red]; } 40 [label="Postponed exit from lambda"]; 41 [label="Function call: R|/queue|.R|kotlin/collections/plusAssign| kotlin/Unit|>(...)" style="filled" fillcolor=yellow]; 42 [label="Exit block"]; } - 43 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 43 [label="Exit function " style="filled" fillcolor=red]; } 44 [label="Postponed exit from lambda"]; 45 [label="Function call: R|/A.A|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.dot b/compiler/fir/analysis-tests/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.dot index 33012c4331a..3ac77c27c36 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.dot +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.dot @@ -57,14 +57,14 @@ digraph tryWithLambdaInside_kt { 17 [label="Postponed enter to lambda"]; subgraph cluster_9 { color=blue - 18 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 18 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_10 { color=blue 19 [label="Enter block"]; 20 [label="Access variable R|/it|"]; 21 [label="Exit block"]; } - 22 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 22 [label="Exit function " style="filled" fillcolor=red]; } 23 [label="Postponed exit from lambda"]; 24 [label="Function call: R|/list|.R|kotlin/collections/filter|(...)" style="filled" fillcolor=yellow]; @@ -146,14 +146,14 @@ finally { 42 [label="Postponed enter to lambda"]; subgraph cluster_18 { color=blue - 43 [label="Enter function anonymousFunction" style="filled" fillcolor=red]; + 43 [label="Enter function " style="filled" fillcolor=red]; subgraph cluster_19 { color=blue 44 [label="Enter block"]; 45 [label="Access variable R|/it|"]; 46 [label="Exit block"]; } - 47 [label="Exit function anonymousFunction" style="filled" fillcolor=red]; + 47 [label="Exit function " style="filled" fillcolor=red]; } 48 [label="Postponed exit from lambda"]; 49 [label="Function call: R|/list|.R|/notInPlaceFilter|(...)" style="filled" fillcolor=yellow]; diff --git a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt index d561c323643..3a69bc7b8bf 100644 --- a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt +++ b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.fir.resolve.dfa.cfg -import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.expressions.FirWhileLoop @@ -18,9 +17,9 @@ fun CFGNode<*>.render(): String = buildString { append( when (this@render) { - is FunctionEnterNode -> "Enter function \"${fir.name()}\"" - is FunctionExitNode -> "Exit function \"${fir.name()}\"" - is LocalFunctionDeclarationNode -> "Local function declaration ${owner.name}" + is FunctionEnterNode -> "Enter function ${owner.name}" + is FunctionExitNode -> "Exit function ${owner.name}" + is LocalFunctionDeclarationNode -> "Local function declaration" is BlockEnterNode -> "Enter block" is BlockExitNode -> "Exit block" @@ -38,7 +37,7 @@ fun CFGNode<*>.render(): String = is LoopBlockExitNode -> "Exit loop block" is LoopConditionEnterNode -> "Enter loop condition" is LoopConditionExitNode -> "Exit loop condition" - is LoopExitNode -> "Exit ${fir.type()}loop" + is LoopExitNode -> "Exit ${fir.type()} loop" is QualifiedAccessNode -> "Access variable ${CfgRenderer.renderElementAsString(fir.calleeReference)}" is ResolvedQualifierNode -> "Access qualifier ${fir.classId}" @@ -102,7 +101,7 @@ fun CFGNode<*>.render(): String = is ClassEnterNode -> "Enter class ${owner.name}" is ClassExitNode -> "Exit class ${owner.name}" - is LocalClassExitNode -> "Exit local class ${owner.name}" + is LocalClassExitNode -> "Local class declaration" is AnonymousObjectEnterNode -> "Enter anonymous object" is AnonymousObjectExpressionExitNode -> "Exit anonymous object expression" @@ -133,15 +132,6 @@ fun CFGNode<*>.render(): String = private val CfgRenderer get() = FirRenderer(annotationRenderer = null, callArgumentsRenderer = FirCallNoArgumentsRenderer()) -private fun FirFunction.name(): String = when (this) { - is FirSimpleFunction -> name.asString() - is FirAnonymousFunction -> "anonymousFunction" - is FirConstructor -> "" - is FirPropertyAccessor -> if (isGetter) "getter" else "setter" - is FirErrorFunction -> "errorFunction" - else -> TODO(toString()) -} - private fun FirLoop.type(): String = when (this) { is FirWhileLoop -> "while" is FirDoWhileLoop -> "do-while" diff --git a/compiler/testData/codegen/box/smartCasts/kt44814.dot b/compiler/testData/codegen/box/smartCasts/kt44814.dot index ce25dc1e6d1..89ce3f42142 100644 --- a/compiler/testData/codegen/box/smartCasts/kt44814.dot +++ b/compiler/testData/codegen/box/smartCasts/kt44814.dot @@ -560,7 +560,7 @@ digraph kt44814_kt { 196 [label="Postponed enter to lambda [3]"]; subgraph cluster_64 { color=blue - 197 [label="Enter function anonymousFunction [4]" style="filled" fillcolor=red]; + 197 [label="Enter function [4]" style="filled" fillcolor=red]; subgraph cluster_65 { color=blue 198 [label="Enter block [4]"]; @@ -573,7 +573,7 @@ digraph kt44814_kt { 205 [label="Equality operator == [4]"]; 206 [label="Exit block [4]"]; } - 207 [label="Exit function anonymousFunction [4]" style="filled" fillcolor=red]; + 207 [label="Exit function [4]" style="filled" fillcolor=red]; } 208 [label="Postponed exit from lambda [3]"]; 209 [label="Function call: this@R|/FirModifierList.Companion.getModifierList|.R|/FirLightSourceElement.lighterASTNode|.R|/LighterASTNode.getChildren|(...).R|kotlin/collections/find|(...) [3]" style="filled" fillcolor=yellow]; @@ -603,7 +603,7 @@ digraph kt44814_kt { 230 [label="Postponed enter to lambda [3]"]; subgraph cluster_67 { color=blue - 231 [label="Enter function anonymousFunction [4]" style="filled" fillcolor=red]; + 231 [label="Enter function [4]" style="filled" fillcolor=red]; subgraph cluster_68 { color=blue 232 [label="Enter block [4]"]; @@ -611,7 +611,7 @@ digraph kt44814_kt { 234 [label="Function call: R|/FirModifierList.FirPsiModifierList.FirPsiModifierList|(...) [4]" style="filled" fillcolor=yellow]; 235 [label="Exit block [4]"]; } - 236 [label="Exit function anonymousFunction [4]" style="filled" fillcolor=red]; + 236 [label="Exit function [4]" style="filled" fillcolor=red]; } 237 [label="Postponed exit from lambda [3]"]; 238 [label="Function call: $subj$.R|kotlin/let|(...) [3]" style="filled" fillcolor=yellow];