Minor. Update test

* If a KotlinGradleSubplugin implements
 KotlinCompilerPluginSupportPlugin, don't apply it as a legacy plugin

* Add the legacy KotlinGradleSubplugin implementations back so that
 when there's JAR hell with META-INF/services in the old artifacts
 pointing to the classes, loading the plugins with ServiceLoader (legacy
 implementation) from the new artifacts would not fail.

* There's a corner case for plugins not in kotlin-gradle-plugin
 If a newer and older version of such a subplugin is used with an older
 version of the Kotlin Gradle plugin, the latter will find the META-INF
 entries and will try to load the subplugins from the new version. With
 the original fix for KT-39809, this would result in silently ignored
 empty stub implementations.

 Given that the Kotlin Gradle plugin can now check if a subplugin
 supports the new API, it's OK to keep the old entries and make the
 stub implementations throw a build error when called, so that improper
 plugin versions are not ignored and are clearly reported.

 Note that this is only necessary for the subplugins not bundled in the
 kotlin-gradle-plugin module, as those will always be in sync with the
 Kotlin version.

Issue #KT-39809 Fixed

.bunch

@@ -1,6 +1,7 @@
 193
 201
 202_201
+203_202_201
 192
 as36_192
 as40

.gitattributes

@@ -3,5 +3,6 @@
 * text=auto
 * eol=lf
 *.png binary
+*.jar binary
 compiler/cli/bin/* eol=lf
 compiler/cli/bin/*.bat eol=crlf

.idea/runConfigurations/Test__stdlib_js_public_kotlin_api_test__overwrite_results.xml

@@ -4,12 +4,13 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="--tests &quot;org.jetbrains.kotlin.js.test.ApiTest&quot; -Poverwrite.output=true" />
+      <option name="scriptParameters" value="--tests &quot;org.jetbrains.kotlin.js.test.ApiTest&quot; -Poverwrite.output=true --parallel" />
       <option name="taskDescriptions">
         <list />
       </option>
       <option name="taskNames">
         <list>
+          <option value=":js:js.tests:cleanTest" />
           <option value=":js:js.tests:test" />
         </list>
       </option>

ReadMe.md

@@ -41,7 +41,12 @@ For local development, if you're not working on bytecode generation or the stand
 
 You also can use [Gradle properties](https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties) to setup `JDK_*` variables.
 
-> Note: The JDK 6 for MacOS is not available on Oracle's site. You can [download it here](https://support.apple.com/kb/DL1572).
+Note: The JDK 6 for MacOS is not available on Oracle's site. You can install it by
+
+```bash
+$ brew tap caskroom/versions
+$ brew cask install java6
+```
 
 On Windows you might need to add long paths setting to the repo:
 

build.gradle.kts

@@ -235,6 +235,7 @@ extra["compilerModules"] = arrayOf(
     ":compiler:ir.serialization.common",
     ":compiler:ir.serialization.js",
     ":compiler:ir.serialization.jvm",
+    ":compiler:ir.interpreter",
     ":kotlin-util-io",
     ":kotlin-util-klib",
     ":kotlin-util-klib-metadata",
@@ -307,7 +308,6 @@ val coreLibProjects = listOfNotNull(
     ":kotlin-stdlib",
     ":kotlin-stdlib-common",
     ":kotlin-stdlib-js",
-    ":kotlin-stdlib-js-ir",
     ":kotlin-stdlib-jdk7",
     ":kotlin-stdlib-jdk8",
     ":kotlin-test:kotlin-test-annotations-common",
@@ -317,7 +317,6 @@ val coreLibProjects = listOfNotNull(
     ":kotlin-test:kotlin-test-junit5",
     ":kotlin-test:kotlin-test-testng",
     ":kotlin-test:kotlin-test-js".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
-    ":kotlin-test:kotlin-test-js-ir".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
     ":kotlin-reflect",
     ":kotlin-coroutines-experimental-compat"
 )
@@ -366,6 +365,15 @@ allprojects {
         }
     }
 
+    configurations.maybeCreate("embeddedElements").apply {
+        extendsFrom(configurations["embedded"])
+        isCanBeConsumed = true
+        isCanBeResolved = false
+        attributes {
+            attribute(Usage.USAGE_ATTRIBUTE, objects.named("embedded-java-runtime"))
+        }
+    }
+
     jvmTarget = defaultJvmTarget
     javaHome = defaultJavaHome
 
@@ -514,6 +522,10 @@ val dist = tasks.register("dist") {
     dependsOn(":kotlin-compiler:dist")
 }
 
+val syncMutedTests = tasks.register("syncMutedTests") {
+    dependsOn(":compiler:tests-mutes:run")
+}
+
 val copyCompilerToIdeaPlugin by task<Copy> {
     dependsOn(dist)
     into(ideaPluginDir)
@@ -539,7 +551,7 @@ tasks {
         }
     }
 
-    listOf("clean", "assemble", "install", "dist").forEach { taskName ->
+    listOf("clean", "assemble", "install").forEach { taskName ->
         register("coreLibs${taskName.capitalize()}") {
             coreLibProjects.forEach { projectName -> dependsOn("$projectName:$taskName") }
         }
@@ -548,6 +560,8 @@ tasks {
     register("coreLibsTest") {
         (coreLibProjects + listOf(
             ":kotlin-stdlib:samples",
+            ":kotlin-stdlib-js-ir",
+            ":kotlin-test:kotlin-test-js-ir".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
             ":kotlin-test:kotlin-test-js:kotlin-test-js-it".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
             ":kotlinx-metadata-jvm",
             ":tools:binary-compatibility-validator"
@@ -804,7 +818,9 @@ tasks {
                 ":kotlin-stdlib-jdk7:publish",
                 ":kotlin-stdlib-jdk8:publish",
                 ":kotlin-reflect:publish",
-                ":kotlin-main-kts:publish"
+                ":kotlin-main-kts:publish",
+                ":kotlin-stdlib-js:publish",
+                ":kotlin-test:kotlin-test-js:publish"
             )
         }
     }

buildSrc/build.gradle.kts

@@ -96,6 +96,7 @@ repositories {
 
 dependencies {
     implementation(kotlin("stdlib", embeddedKotlinVersion))
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.17")
     implementation("com.gradle.publish:plugin-publish-plugin:0.11.0")
 

buildSrc/src/main/kotlin/artifacts.kt

@@ -27,6 +27,7 @@ import org.gradle.api.tasks.javadoc.Javadoc
 import org.gradle.jvm.tasks.Jar
 import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.kotlin.dsl.*
+import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetContainer
 import plugins.KotlinBuildPublishingPlugin
 
 
@@ -129,10 +130,16 @@ fun Project.sourcesJar(body: Jar.() -> Unit = {}): TaskProvider<Jar> {
     }
 
     val sourcesJar = getOrCreateTask<Jar>("sourcesJar") {
+        fun Project.mainJavaPluginSourceSet() = findJavaPluginConvention()?.sourceSets?.findByName("main")
+        fun Project.mainKotlinSourceSet() =
+            (extensions.findByName("kotlin") as? KotlinSourceSetContainer)?.sourceSets?.findByName("main")
+
+        fun Project.sources() = mainJavaPluginSourceSet()?.allSource ?: mainKotlinSourceSet()?.kotlin
+
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         archiveClassifier.set("sources")
 
-        from(project.mainSourceSet.allSource)
+        from(project.sources())
 
         project.configurations.findByName("embedded")?.let { embedded ->
             from(provider {
@@ -141,10 +148,7 @@ fun Project.sourcesJar(body: Jar.() -> Unit = {}): TaskProvider<Jar> {
                     .map { it.id.componentIdentifier }
                     .filterIsInstance<ProjectComponentIdentifier>()
                     .mapNotNull {
-                        project(it.projectPath)
-                            .findJavaPluginConvention()
-                            ?.mainSourceSet
-                            ?.allSource
+                        project(it.projectPath).sources()
                     }
             })
         }

buildSrc/src/main/kotlin/pluginMarkers.kt

@@ -9,12 +9,16 @@ import org.gradle.api.Project
 import org.gradle.api.publish.PublicationContainer
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
 import org.gradle.api.tasks.bundling.Jar
 import org.gradle.kotlin.dsl.*
 import plugins.KotlinBuildPublishingPlugin
+import plugins.configureRepository
+import java.util.*
 
 internal const val PLUGIN_MARKER_SUFFIX = ".gradle.plugin"
 
+@UseExperimental(ExperimentalStdlibApi::class)
 fun Project.publishPluginMarkers(withEmptyJars: Boolean = true) {
     val pluginDevelopment = extensions.getByType<PluginBundleExtension>()
     val publishingExtension = extensions.getByType<PublishingExtension>()
@@ -25,6 +29,10 @@ fun Project.publishPluginMarkers(withEmptyJars: Boolean = true) {
         if (withEmptyJars) {
             addEmptyJarArtifacts(markerPublication)
         }
+
+        tasks.named<PublishToMavenRepository>(
+            "publish${markerPublication.name.capitalize(Locale.ROOT)}PublicationTo${KotlinBuildPublishingPlugin.REPOSITORY_NAME}Repository"
+        ).configureRepository()
     }
 }
 

buildSrc/src/main/kotlin/plugins/KotlinBuildPublishingPlugin.kt

@@ -15,9 +15,11 @@ import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
 import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
+import org.gradle.api.tasks.TaskProvider
 import org.gradle.kotlin.dsl.*
 import org.gradle.plugins.signing.SigningExtension
 import org.gradle.plugins.signing.SigningPlugin
+import java.net.URI
 import java.util.*
 import javax.inject.Inject
 
@@ -119,25 +121,8 @@ class KotlinBuildPublishingPlugin @Inject constructor(
             dependsOn(tasks.named("publishToMavenLocal"))
         }
 
-        tasks.named<PublishToMavenRepository>("publish${PUBLICATION_NAME}PublicationTo${REPOSITORY_NAME}Repository") {
-            dependsOn(project.rootProject.tasks.named("preparePublication"))
-            doFirst {
-                val preparePublication = project.rootProject.tasks.named("preparePublication").get()
-                val username: String? by preparePublication.extra
-                val password: String? by preparePublication.extra
-                val repoUrl: String by preparePublication.extra
-
-                repository.apply {
-                    url = uri(repoUrl)
-                    if (url.scheme != "file" && username != null && password != null) {
-                        credentials {
-                            this.username = username
-                            this.password = password
-                        }
-                    }
-                }
-            }
-        }
+        tasks.named<PublishToMavenRepository>("publish${PUBLICATION_NAME}PublicationTo${REPOSITORY_NAME}Repository")
+            .configureRepository()
     }
 
     companion object {
@@ -152,4 +137,24 @@ class KotlinBuildPublishingPlugin @Inject constructor(
         fun humanReadableName(project: Project) =
             project.name.split("-").joinToString(separator = " ") { it.capitalize(Locale.ROOT) }
     }
+}
+
+fun TaskProvider<PublishToMavenRepository>.configureRepository() = configure {
+    dependsOn(project.rootProject.tasks.named("preparePublication"))
+    doFirst {
+        val preparePublication = project.rootProject.tasks.named("preparePublication").get()
+        val username: String? by preparePublication.extra
+        val password: String? by preparePublication.extra
+        val repoUrl: String by preparePublication.extra
+
+        repository.apply {
+            url = project.uri(repoUrl)
+            if (url.scheme != "file" && username != null && password != null) {
+                credentials {
+                    this.username = username
+                    this.password = password
+                }
+            }
+        }
+    }
 }

compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt

@@ -294,7 +294,7 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager
                     val kind = KotlinBaseTest.extractConfigurationKind(testFiles)
                     val jdkKind = KotlinBaseTest.getTestJdkKind(testFiles)
                     val keyConfiguration = CompilerConfiguration()
-                    CodegenTestCase.updateConfigurationByDirectivesInTestFiles(testFiles, keyConfiguration)
+                    KotlinBaseTest.updateConfigurationByDirectivesInTestFiles(testFiles, keyConfiguration)
 
                     val key = ConfigurationKey(kind, jdkKind, keyConfiguration.toString())
                     val compiler = if (isJvm8Target) {
@@ -303,7 +303,7 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager
                     val filesHolder = holders.getOrPut(key) {
                         FilesWriter(compiler, KotlinTestUtils.newConfiguration(kind, jdkKind, KotlinTestUtils.getAnnotationsJar()).apply {
                             println("Creating new configuration by $key")
-                            CodegenTestCase.updateConfigurationByDirectivesInTestFiles(testFiles, this)
+                            KotlinBaseTest.updateConfigurationByDirectivesInTestFiles(testFiles, this)
                         })
                     }
 

compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.kt

@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.backend.common
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.backend.common.bridges.findInterfaceImplementation
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.diagnostics.DiagnosticSink
 import org.jetbrains.kotlin.diagnostics.Errors
@@ -24,6 +23,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolver
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.util.getExceptionMessage
+import org.jetbrains.kotlin.util.getNonPrivateTraitMembersForDelegation
 import org.jetbrains.kotlin.utils.DFS
 import org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments
 
@@ -55,14 +55,8 @@ object CodegenUtil {
     @JvmOverloads
     fun getNonPrivateTraitMethods(descriptor: ClassDescriptor, copy: Boolean = true): Map<FunctionDescriptor, FunctionDescriptor> {
         val result = linkedMapOf<FunctionDescriptor, FunctionDescriptor>()
-        for (declaration in DescriptorUtils.getAllDescriptors(descriptor.defaultType.memberScope)) {
-            if (declaration !is CallableMemberDescriptor) continue
-
-            val traitMember = findInterfaceImplementation(declaration)
-            if (traitMember == null ||
-                    Visibilities.isPrivate(traitMember.visibility) ||
-                    traitMember.visibility == Visibilities.INVISIBLE_FAKE) continue
 
+        for ((declaration, traitMember) in getNonPrivateTraitMembersForDelegation(descriptor)) {
             assert(traitMember.modality !== Modality.ABSTRACT) { "Cannot delegate to abstract trait method: $declaration" }
 
             // inheritedMember can be abstract here. In order for FunctionCodegen to generate the method body, we're creating a copy here

compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt

@@ -24,6 +24,8 @@ import org.jetbrains.kotlin.resolve.OverridingUtil
 import org.jetbrains.kotlin.resolve.calls.callResolverUtil.isOrOverridesSynthesized
 import org.jetbrains.kotlin.resolve.descriptorUtil.isTypeRefinementEnabled
 import org.jetbrains.kotlin.resolve.descriptorUtil.module
+import org.jetbrains.kotlin.util.findImplementationFromInterface
+import org.jetbrains.kotlin.util.findInterfaceImplementation
 
 fun <Signature> generateBridgesForFunctionDescriptor(
     descriptor: FunctionDescriptor,
@@ -81,60 +83,4 @@ open class DescriptorBasedFunctionHandle(val descriptor: FunctionDescriptor) : F
     override fun toString(): String {
         return descriptor.toString()
     }
-}
-
-
-/**
- * Given a fake override in a class, returns an overridden declaration with implementation in trait, such that a method delegating to that
- * trait implementation should be generated into the class containing the fake override; or null if the given function is not a fake
- * override of any trait implementation or such method was already generated into the superclass or is a method from Any.
- */
-fun findInterfaceImplementation(descriptor: CallableMemberDescriptor): CallableMemberDescriptor? {
-    if (descriptor.kind.isReal) return null
-    if (isOrOverridesSynthesized(descriptor)) return null
-
-    val implementation = findImplementationFromInterface(descriptor) ?: return null
-    val immediateConcreteSuper = firstSuperMethodFromKotlin(descriptor, implementation) ?: return null
-
-    if (!DescriptorUtils.isInterface(immediateConcreteSuper.containingDeclaration)) {
-        // If this implementation is already generated into the superclass, we need not generate it again, it'll be inherited
-        return null
-    }
-
-    return immediateConcreteSuper
-}
-
-/**
- * Given a fake override, returns an overridden non-abstract function from an interface which is the actual implementation of this function
- * that should be called when the given fake override is called.
- */
-fun findImplementationFromInterface(descriptor: CallableMemberDescriptor): CallableMemberDescriptor? {
-    val overridden = OverridingUtil.getOverriddenDeclarations(descriptor)
-    val filtered = OverridingUtil.filterOutOverridden(overridden)
-
-    val result = filtered.firstOrNull { it.modality != Modality.ABSTRACT } ?: return null
-
-    if (DescriptorUtils.isClassOrEnumClass(result.containingDeclaration)) return null
-
-    return result
-}
-
-/**
- * Given a fake override and its implementation (non-abstract declaration) somewhere in supertypes,
- * returns the first immediate super function of the given fake override which overrides that implementation.
- * The returned function should be called from TImpl-bridges generated for the given fake override.
- */
-fun firstSuperMethodFromKotlin(
-    descriptor: CallableMemberDescriptor,
-    implementation: CallableMemberDescriptor
-): CallableMemberDescriptor? {
-    return descriptor.overriddenDescriptors.firstOrNull { overridden ->
-        overridden.modality != Modality.ABSTRACT &&
-                (overridden == implementation || OverridingUtil.overrides(
-                    overridden,
-                    implementation,
-                    overridden.module.isTypeRefinementEnabled(),
-                    true
-                ))
-    }
-}
+}

compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java

@@ -90,12 +90,18 @@ public abstract class AnnotationCodegen {
     private final KotlinTypeMapper typeMapper;
     private final ModuleDescriptor module;
     private final GenerationState state;
+    private final boolean skipNullabilityAnnotations;
 
     private AnnotationCodegen(@NotNull InnerClassConsumer innerClassConsumer, @NotNull GenerationState state) {
+        this(innerClassConsumer, state, false);
+    }
+
+    private AnnotationCodegen(@NotNull InnerClassConsumer innerClassConsumer, @NotNull GenerationState state, boolean skipNullabilityAnnotations) {
         this.innerClassConsumer = innerClassConsumer;
         this.typeMapper = state.getTypeMapper();
         this.module = state.getModule();
         this.state = state;
+        this.skipNullabilityAnnotations = skipNullabilityAnnotations;
     }
 
     /**
@@ -105,6 +111,16 @@ public abstract class AnnotationCodegen {
             @Nullable Annotated annotated,
             @Nullable Type returnType,
             @Nullable KotlinType typeForTypeAnnotations
+    ) {
+        genAnnotations(annotated, returnType, typeForTypeAnnotations, null, Collections.emptyList());
+    }
+
+    public void genAnnotations(
+            @Nullable Annotated annotated,
+            @Nullable Type returnType,
+            @Nullable KotlinType typeForTypeAnnotations,
+            @Nullable DeclarationDescriptorWithVisibility parameterContainer,
+            @NotNull List<Class<?>> additionalAnnotations
     ) {
         if (annotated == null) return;
 
@@ -139,22 +155,28 @@ public abstract class AnnotationCodegen {
             }
         }
 
-        generateAdditionalAnnotations(annotated, returnType, annotationDescriptorsAlreadyPresent);
+        for (Class<?> annotation : additionalAnnotations) {
+            String descriptor = generateAnnotationIfNotPresent(annotationDescriptorsAlreadyPresent, annotation);
+            annotationDescriptorsAlreadyPresent.add(descriptor);
+        }
+
+        generateAdditionalAnnotations(annotated, returnType, annotationDescriptorsAlreadyPresent, parameterContainer);
         generateTypeAnnotations(annotated, typeForTypeAnnotations);
     }
 
     private void generateAdditionalAnnotations(
             @NotNull Annotated annotated,
             @Nullable Type returnType,
-            @NotNull Set<String> annotationDescriptorsAlreadyPresent
+            @NotNull Set<String> annotationDescriptorsAlreadyPresent,
+            @Nullable DeclarationDescriptorWithVisibility parameterContainer
     ) {
         if (annotated instanceof CallableDescriptor) {
-            generateAdditionalCallableAnnotations((CallableDescriptor) annotated, returnType, annotationDescriptorsAlreadyPresent);
+            generateAdditionalCallableAnnotations((CallableDescriptor) annotated, returnType, annotationDescriptorsAlreadyPresent, parameterContainer);
         }
         else if (annotated instanceof FieldDescriptor) {
             generateAdditionalCallableAnnotations(
-                    ((FieldDescriptor) annotated).getCorrespondingProperty(), returnType, annotationDescriptorsAlreadyPresent
-            );
+                    ((FieldDescriptor) annotated).getCorrespondingProperty(), returnType, annotationDescriptorsAlreadyPresent,
+                    parameterContainer);
         }
         else if (annotated instanceof ClassDescriptor) {
             generateAdditionalClassAnnotations(annotationDescriptorsAlreadyPresent, (ClassDescriptor) annotated);
@@ -164,11 +186,15 @@ public abstract class AnnotationCodegen {
     private void generateAdditionalCallableAnnotations(
             @NotNull CallableDescriptor descriptor,
             @Nullable Type returnType,
-            @NotNull Set<String> annotationDescriptorsAlreadyPresent
+            @NotNull Set<String> annotationDescriptorsAlreadyPresent,
+            @Nullable DeclarationDescriptorWithVisibility parameterContainer
     ) {
         // No need to annotate privates, synthetic accessors and their parameters
         if (isInvisibleFromTheOutside(descriptor)) return;
-        if (descriptor instanceof ValueParameterDescriptor && isInvisibleFromTheOutside(descriptor.getContainingDeclaration())) return;
+        if (descriptor instanceof ParameterDescriptor &&
+            isInvisibleFromTheOutside(parameterContainer != null ? parameterContainer : descriptor.getContainingDeclaration())) {
+            return;
+        }
 
         // No need to annotate annotation methods since they're always non-null
         if (descriptor instanceof PropertyGetterDescriptor &&
@@ -176,7 +202,7 @@ public abstract class AnnotationCodegen {
             return;
         }
 
-        if (returnType != null && !AsmUtil.isPrimitive(returnType)) {
+        if (returnType != null && !AsmUtil.isPrimitive(returnType) && !skipNullabilityAnnotations) {
             generateNullabilityAnnotation(descriptor.getReturnType(), annotationDescriptorsAlreadyPresent);
         }
     }
@@ -312,11 +338,13 @@ public abstract class AnnotationCodegen {
         visitor.visitEnd();
     }
 
-    private void generateAnnotationIfNotPresent(Set<String> annotationDescriptorsAlreadyPresent, Class<?> annotationClass) {
+    @NotNull
+    private String generateAnnotationIfNotPresent(Set<String> annotationDescriptorsAlreadyPresent, Class<?> annotationClass) {
         String descriptor = Type.getType(annotationClass).getDescriptor();
         if (!annotationDescriptorsAlreadyPresent.contains(descriptor)) {
             visitAnnotation(descriptor, false).visitEnd();
         }
+        return descriptor;
     }
 
     private static boolean isBareTypeParameterWithNullableUpperBound(@NotNull KotlinType type) {
@@ -600,7 +628,16 @@ public abstract class AnnotationCodegen {
             @NotNull InnerClassConsumer innerClassConsumer,
             @NotNull GenerationState state
     ) {
-        return new AnnotationCodegen(innerClassConsumer, state) {
+        return forMethod(mv, innerClassConsumer, state, false);
+    }
+
+    public static AnnotationCodegen forMethod(
+            @NotNull MethodVisitor mv,
+            @NotNull InnerClassConsumer innerClassConsumer,
+            @NotNull GenerationState state,
+            boolean skipNullabilityAnnotations
+    ) {
+        return new AnnotationCodegen(innerClassConsumer, state, skipNullabilityAnnotations) {
             @NotNull
             @Override
             AnnotationVisitor visitAnnotation(String descr, boolean visible) {
@@ -620,7 +657,16 @@ public abstract class AnnotationCodegen {
             @NotNull InnerClassConsumer innerClassConsumer,
             @NotNull GenerationState state
     ) {
-        return new AnnotationCodegen(innerClassConsumer, state) {
+        return forField(fv, innerClassConsumer, state, false);
+    }
+
+    public static AnnotationCodegen forField(
+            @NotNull FieldVisitor fv,
+            @NotNull InnerClassConsumer innerClassConsumer,
+            @NotNull GenerationState state,
+            boolean skipNullabilityAnnotations
+    ) {
+        return new AnnotationCodegen(innerClassConsumer, state, skipNullabilityAnnotations) {
             @NotNull
             @Override
             AnnotationVisitor visitAnnotation(String descr, boolean visible) {
@@ -639,9 +685,10 @@ public abstract class AnnotationCodegen {
             int parameter,
             @NotNull MethodVisitor mv,
             @NotNull InnerClassConsumer innerClassConsumer,
-            @NotNull GenerationState state
+            @NotNull GenerationState state,
+            boolean skipNullabilityAnnotations
     ) {
-        return new AnnotationCodegen(innerClassConsumer, state) {
+        return new AnnotationCodegen(innerClassConsumer, state, skipNullabilityAnnotations) {
             @NotNull
             @Override
             AnnotationVisitor visitAnnotation(String descr, boolean visible) {

compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java

@@ -10,7 +10,6 @@ import kotlin.collections.CollectionsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.backend.common.CodegenUtil;
-import org.jetbrains.kotlin.backend.common.bridges.ImplKt;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.codegen.context.ClassContext;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
@@ -39,6 +38,7 @@ import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.enumEntryNeedS
 import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration;
 import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE;
 import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind.CLASS_MEMBER_DELEGATION_TO_DEFAULT_IMPL;
+import static org.jetbrains.kotlin.util.DeclarationUtilKt.findInterfaceImplementation;
 
 public abstract class ClassBodyCodegen extends MemberCodegen<KtPureClassOrObject> {
     @NotNull
@@ -125,7 +125,7 @@ public abstract class ClassBodyCodegen extends MemberCodegen<KtPureClassOrObject
         for (DeclarationDescriptor memberDescriptor : DescriptorUtils.getAllDescriptors(descriptor.getDefaultType().getMemberScope())) {
             if (memberDescriptor instanceof CallableMemberDescriptor) {
                 CallableMemberDescriptor member = (CallableMemberDescriptor) memberDescriptor;
-                if (!member.getKind().isReal() && ImplKt.findInterfaceImplementation(member) == null) {
+                if (!member.getKind().isReal() && findInterfaceImplementation(member) == null) {
                     if (member instanceof FunctionDescriptor) {
                         functionCodegen.generateBridges((FunctionDescriptor) member);
                     }
@@ -238,10 +238,7 @@ public abstract class ClassBodyCodegen extends MemberCodegen<KtPureClassOrObject
     ) {
         // Skip Java 8 default methods
         if (CodegenUtilKt.isDefinitelyNotDefaultImplsMethod(interfaceFun) ||
-            JvmAnnotationUtilKt.isCallableMemberCompiledToJvmDefault(
-                    DescriptorUtils.unwrapFakeOverrideToAnyDeclaration(interfaceFun), state.getJvmDefaultMode()
-            )
-        ) {
+            JvmAnnotationUtilKt.checkIsImplementationCompiledToJvmDefault(interfaceFun, state.getJvmDefaultMode())) {
             return;
         }
 

compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt

@@ -153,18 +153,18 @@ class DefaultParameterValueSubstitutor(val state: GenerationState) {
             signature.genericsSignature,
             FunctionCodegen.getThrownExceptions(functionDescriptor, typeMapper)
         )
+        val skipNullabilityAnnotations = flags and Opcodes.ACC_PRIVATE != 0 || flags and Opcodes.ACC_SYNTHETIC != 0
 
-        AnnotationCodegen.forMethod(mv, memberCodegen, state).genAnnotations(
-            functionDescriptor,
-            signature.returnType,
-            functionDescriptor.returnType
-        )
+        AnnotationCodegen.forMethod(mv, memberCodegen, state, skipNullabilityAnnotations)
+            .genAnnotations(functionDescriptor, signature.returnType, functionDescriptor.returnType)
 
         if (state.classBuilderMode == ClassBuilderMode.KAPT3) {
             mv.visitAnnotation(ANNOTATION_TYPE_DESCRIPTOR_FOR_JVM_OVERLOADS_GENERATED_METHODS, false)
         }
 
-        FunctionCodegen.generateParameterAnnotations(functionDescriptor, mv, signature, remainingParameters, memberCodegen, state)
+        FunctionCodegen.generateParameterAnnotations(
+            functionDescriptor, mv, signature, remainingParameters, memberCodegen, state, skipNullabilityAnnotations
+        )
 
         if (!state.classBuilderMode.generateBodies) {
             FunctionCodegen.generateLocalVariablesForParameters(

compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java

@@ -193,6 +193,10 @@ public class FunctionCodegen {
         if (origin.getOriginKind() == JvmDeclarationOriginKind.SAM_DELEGATION) {
             flags |= ACC_SYNTHETIC;
         }
+        boolean isCompatibilityStubInDefaultImpls = isCompatibilityStubInDefaultImpls(functionDescriptor, methodContext, state.getJvmDefaultMode());
+        if (isCompatibilityStubInDefaultImpls) {
+            flags |= ACC_DEPRECATED;
+        }
 
         if (functionDescriptor.isExternal() && owner instanceof MultifileClassFacadeContext) {
             // Native methods are only defined in facades and do not need package part implementations
@@ -201,12 +205,13 @@ public class FunctionCodegen {
 
         MethodVisitor mv =
                 strategy.wrapMethodVisitor(
-                        newMethod(origin,
-                                  flags,
-                                  asmMethod.getName(),
-                                  asmMethod.getDescriptor(),
-                                  strategy.skipGenericSignature() ? null : jvmSignature.getGenericsSignature(),
-                                  getThrownExceptions(functionDescriptor, typeMapper)
+                        newMethod(
+                                origin,
+                                flags,
+                                asmMethod.getName(),
+                                asmMethod.getDescriptor(),
+                                strategy.skipGenericSignature() ? null : jvmSignature.getGenericsSignature(),
+                                getThrownExceptions(functionDescriptor, typeMapper)
                         ),
                         flags, asmMethod.getName(),
                         asmMethod.getDescriptor()
@@ -214,8 +219,12 @@ public class FunctionCodegen {
 
         recordMethodForFunctionIfAppropriate(functionDescriptor, asmMethod);
 
-        generateMethodAnnotationsIfRequired(functionDescriptor, asmMethod, jvmSignature, mv);
-
+        boolean skipNullabilityAnnotations = (flags & ACC_PRIVATE) != 0 || (flags & ACC_SYNTHETIC) != 0;
+        generateMethodAnnotationsIfRequired(
+                functionDescriptor, asmMethod, jvmSignature, mv,
+                isCompatibilityStubInDefaultImpls ? Collections.singletonList(Deprecated.class) : Collections.emptyList(),
+                skipNullabilityAnnotations
+        );
         GenerateJava8ParameterNamesKt.generateParameterNames(functionDescriptor, mv, jvmSignature, state, (flags & ACC_SYNTHETIC) != 0);
 
         if (contextKind != OwnerKind.ERASED_INLINE_CLASS) {
@@ -276,7 +285,9 @@ public class FunctionCodegen {
             @NotNull FunctionDescriptor functionDescriptor,
             @NotNull Method asmMethod,
             @NotNull JvmMethodGenericSignature jvmSignature,
-            @NotNull MethodVisitor mv
+            @NotNull MethodVisitor mv,
+            @NotNull List<Class<?>> additionalNoArgAnnotations,
+            boolean skipNullabilityAnnotations
     ) {
         FunctionDescriptor annotationsOwner;
         if (shouldHideConstructorDueToInlineClassTypeValueParameters(functionDescriptor)) {
@@ -291,10 +302,14 @@ public class FunctionCodegen {
             annotationsOwner = functionDescriptor;
         }
 
-        AnnotationCodegen.forMethod(mv, memberCodegen, state)
-                .genAnnotations(annotationsOwner, asmMethod.getReturnType(), functionDescriptor.getReturnType());
+        AnnotationCodegen.forMethod(mv, memberCodegen, state, skipNullabilityAnnotations)
+                .genAnnotations(annotationsOwner, asmMethod.getReturnType(), functionDescriptor.getReturnType(), null, additionalNoArgAnnotations);
 
-        generateParameterAnnotations(annotationsOwner, mv, jvmSignature, memberCodegen, state);
+        generateParameterAnnotations(
+                annotationsOwner, mv, jvmSignature,
+                annotationsOwner.getValueParameters(),
+                memberCodegen, state, skipNullabilityAnnotations
+        );
     }
 
     @NotNull
@@ -488,25 +503,14 @@ public class FunctionCodegen {
         return descriptor != null && !InlineUtil.isInlineOrContainingInline(descriptor);
     }
 
-    public static void generateParameterAnnotations(
-            @NotNull FunctionDescriptor functionDescriptor,
-            @NotNull MethodVisitor mv,
-            @NotNull JvmMethodSignature jvmSignature,
-            @NotNull InnerClassConsumer innerClassConsumer,
-            @NotNull GenerationState state
-    ) {
-        generateParameterAnnotations(
-                functionDescriptor, mv, jvmSignature, functionDescriptor.getValueParameters(), innerClassConsumer, state
-        );
-    }
-
     public static void generateParameterAnnotations(
             @NotNull FunctionDescriptor functionDescriptor,
             @NotNull MethodVisitor mv,
             @NotNull JvmMethodSignature jvmSignature,
             @NotNull List<ValueParameterDescriptor> valueParameters,
-            @NotNull InnerClassConsumer innerClassConsumer,
-            @NotNull GenerationState state
+            @NotNull MemberCodegen<?> memberCodegen,
+            @NotNull GenerationState state,
+            boolean skipNullabilityAnnotations
     ) {
         if (isAccessor(functionDescriptor)) return;
 
@@ -516,6 +520,7 @@ public class FunctionCodegen {
 
         Asm7UtilKt.visitAnnotableParameterCount(mv, kotlinParameterTypes.size() - syntheticParameterCount);
 
+        boolean isDefaultImpl = OwnerKind.DEFAULT_IMPLS == memberCodegen.context.getContextKind();
         for (int i = 0; i < kotlinParameterTypes.size(); i++) {
             JvmMethodParameterSignature parameterSignature = kotlinParameterTypes.get(i);
             JvmMethodParameterKind kind = parameterSignature.getKind();
@@ -528,13 +533,14 @@ public class FunctionCodegen {
                     ? iterator.next()
                     : kind == JvmMethodParameterKind.RECEIVER
                       ? JvmCodegenUtil.getDirectMember(functionDescriptor).getExtensionReceiverParameter()
-                      : null;
+                      : isDefaultImpl && kind == JvmMethodParameterKind.THIS ? JvmCodegenUtil.getDirectMember(functionDescriptor)
+                              .getDispatchReceiverParameter() : null;
 
             if (annotated != null) {
                 //noinspection ConstantConditions
                 int parameterIndex = i - syntheticParameterCount;
-                AnnotationCodegen.forParameter(parameterIndex, mv, innerClassConsumer, state)
-                        .genAnnotations(annotated, parameterSignature.getAsmType(), annotated.getReturnType());
+                AnnotationCodegen.forParameter(parameterIndex, mv, memberCodegen, state, skipNullabilityAnnotations)
+                        .genAnnotations(annotated, parameterSignature.getAsmType(), annotated.getReturnType(), functionDescriptor, Collections.emptyList());
             }
         }
     }
@@ -606,7 +612,7 @@ public class FunctionCodegen {
                     true, mv,
                     method.getAsmMethod(),
                     method.getOwner().getInternalName(),
-                    true);
+                    true, signature.getReturnType());
             methodEnd = new Label();
         }
         else {
@@ -710,10 +716,8 @@ public class FunctionCodegen {
             @NotNull JvmDefaultMode jvmDefaultMode
     ) {
         return OwnerKind.DEFAULT_IMPLS == context.getContextKind() &&
-               JvmAnnotationUtilKt
-                       .isCompiledToJvmDefault(DescriptorUtils.unwrapFakeOverrideToAnyDeclaration(functionDescriptor),
-                                               jvmDefaultMode) &&
-               jvmDefaultMode.isCompatibility();
+            jvmDefaultMode.isCompatibility() &&
+            JvmAnnotationUtilKt.checkIsImplementationCompiledToJvmDefault(functionDescriptor, jvmDefaultMode);
     }
 
     private static void generateLocalVariableTable(
@@ -849,7 +853,8 @@ public class FunctionCodegen {
             @NotNull Method asmMethod,
             @NotNull String classToDelegateTo,
             int opcode,
-            boolean isInterface
+            boolean isInterface,
+            @NotNull Type returnType
     ) {
         InstructionAdapter iv = new InstructionAdapter(mv);
         Type[] argTypes = asmMethod.getArgumentTypes();
@@ -871,7 +876,8 @@ public class FunctionCodegen {
             paramIndex += argType.getSize();
         }
         iv.visitMethodInsn(opcode, classToDelegateTo, asmMethod.getName(), asmMethod.getDescriptor(), isInterface);
-        iv.areturn(asmMethod.getReturnType());
+        StackValue.onStack(asmMethod.getReturnType()).coerceTo(returnType, null, iv);
+        iv.areturn(returnType);
     }
 
     private static void generateDelegateToStaticErasedVersion(
@@ -910,7 +916,19 @@ public class FunctionCodegen {
             @NotNull String classToDelegateTo,
             boolean isInterfaceMethodCall
     ) {
-        generateDelegateToMethodBody(isStatic ? 0 : 1, mv, asmMethod, classToDelegateTo, Opcodes.INVOKESTATIC, isInterfaceMethodCall);
+        generateDelegateToStaticMethodBody(isStatic, mv, asmMethod, classToDelegateTo, isInterfaceMethodCall, asmMethod.getReturnType());
+    }
+
+
+    private static void generateDelegateToStaticMethodBody(
+            boolean isStatic,
+            @NotNull MethodVisitor mv,
+            @NotNull Method asmMethod,
+            @NotNull String classToDelegateTo,
+            boolean isInterfaceMethodCall,
+            @NotNull Type returnType
+    ) {
+        generateDelegateToMethodBody(isStatic ? 0 : 1, mv, asmMethod, classToDelegateTo, Opcodes.INVOKESTATIC, isInterfaceMethodCall, returnType);
     }
 
     private static boolean needIndexForVar(JvmMethodParameterKind kind) {
@@ -1656,7 +1674,9 @@ public class FunctionCodegen {
 
         if (JvmAnnotationUtilKt.isCompiledToJvmDefault(memberDescriptor, mode)) {
             return (kind != OwnerKind.DEFAULT_IMPLS && !isSynthetic) ||
-                   (kind == OwnerKind.DEFAULT_IMPLS && (isSynthetic || mode.isCompatibility()));
+                   (kind == OwnerKind.DEFAULT_IMPLS &&
+                    (isSynthetic || //TODO: move synthetic method generation into interface
+                     (mode.isCompatibility() && !JvmAnnotationUtilKt.hasJvmDefaultNoCompatibilityAnnotation(containingDeclaration))));
         } else {
             switch (kind) {
                 case DEFAULT_IMPLS: return true;

compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java

@@ -771,10 +771,12 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
 
         if (isNonCompanionObject(descriptor)) {
             StackValue.Field field = StackValue.createSingletonViaInstance(descriptor, typeMapper, INSTANCE_FIELD);
-            v.newField(JvmDeclarationOriginKt.OtherOriginFromPure(myClass),
-                       ACC_PUBLIC | ACC_STATIC | ACC_FINAL,
-                       field.name, field.type.getDescriptor(), null, null);
-
+            FieldVisitor fv = v.newField(
+                    JvmDeclarationOriginKt.OtherOriginFromPure(myClass),
+                    ACC_PUBLIC | ACC_STATIC | ACC_FINAL,
+                    field.name, field.type.getDescriptor(), null, null
+            );
+            AnnotationCodegen.forField(fv, this, state).visitAnnotation(Type.getDescriptor(NotNull.class), false).visitEnd();
             return;
         }
 
@@ -816,10 +818,13 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
             fieldAccessFlags |= ACC_SYNTHETIC;
         }
         StackValue.Field field = StackValue.singleton(companionObjectDescriptor, typeMapper);
-        FieldVisitor fv = v.newField(JvmDeclarationOriginKt.OtherOrigin(companionObject == null ? myClass.getPsiOrParent() : companionObject),
-                                     fieldAccessFlags, field.name, field.type.getDescriptor(), null, null);
+        FieldVisitor fv = v.newField(
+                JvmDeclarationOriginKt.OtherOrigin(companionObject == null ? myClass.getPsiOrParent() : companionObject),
+                fieldAccessFlags, field.name, field.type.getDescriptor(), null, null
+        );
+        AnnotationCodegen.forField(fv, this, state).visitAnnotation(Type.getDescriptor(NotNull.class), false).visitEnd();
         if (fieldShouldBeDeprecated) {
-            AnnotationCodegen.forField(fv, this, state).visitAnnotation("Ljava/lang/Deprecated;", true).visitEnd();
+            AnnotationCodegen.forField(fv, this, state).visitAnnotation(Type.getDescriptor(Deprecated.class), true).visitEnd();
         }
     }
 

compiler/backend/src/org/jetbrains/kotlin/codegen/InterfaceImplBodyCodegen.kt

@@ -17,8 +17,7 @@
 package org.jetbrains.kotlin.codegen
 
 import com.intellij.util.ArrayUtil
-import org.jetbrains.kotlin.backend.common.bridges.findImplementationFromInterface
-import org.jetbrains.kotlin.backend.common.bridges.firstSuperMethodFromKotlin
+import org.jetbrains.kotlin.util.findImplementationFromInterface
 import org.jetbrains.kotlin.codegen.context.ClassContext
 import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.codegen.state.JvmMethodExceptionTypes
@@ -29,6 +28,7 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind
 import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature
+import org.jetbrains.kotlin.util.firstSuperMethodFromKotlin
 import org.jetbrains.org.objectweb.asm.MethodVisitor
 import org.jetbrains.org.objectweb.asm.Opcodes.*
 

compiler/backend/src/org/jetbrains/kotlin/codegen/JvmBridgesImpl.kt

@@ -16,6 +16,8 @@ import org.jetbrains.kotlin.load.java.descriptors.JavaForKotlinOverridePropertyD
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.jvm.annotations.isCompiledToJvmDefault
 import org.jetbrains.kotlin.resolve.jvm.annotations.hasPlatformDependentAnnotation
+import org.jetbrains.kotlin.util.findImplementationFromInterface
+import org.jetbrains.kotlin.util.findInterfaceImplementation
 
 class DescriptorBasedFunctionHandleForJvm(
     descriptor: FunctionDescriptor,

compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java

@@ -438,7 +438,13 @@ public class PropertyCodegen {
             );
 
             if (annotatedField != null) {
-                AnnotationCodegen.forField(fv, memberCodegen, state)
+                // Don't emit nullability annotations for backing field if:
+                // - backing field is invisible from Java (private or synthetic);
+                // - property is lateinit (since corresponding field is actually nullable).
+                boolean skipNullabilityAnnotations =
+                        (modifiers & ACC_PRIVATE) != 0 || (modifiers & ACC_SYNTHETIC) != 0 ||
+                        propertyDescriptor.isLateInit();
+                AnnotationCodegen.forField(fv, memberCodegen, state, skipNullabilityAnnotations)
                         .genAnnotations(annotatedField, type, propertyDescriptor.getType());
             }
         }

compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineCodegen.kt

@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.codegen.context.MethodContext
 import org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings.METHOD_FOR_FUNCTION
 import org.jetbrains.kotlin.codegen.serialization.JvmSerializerExtension
 import org.jetbrains.kotlin.codegen.state.GenerationState
+import org.jetbrains.kotlin.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.isReleaseCoroutines
 import org.jetbrains.kotlin.descriptors.*
@@ -512,7 +513,8 @@ class CoroutineCodegenForLambda private constructor(
                         containingClassInternalName = v.thisName,
                         isForNamedFunction = false,
                         languageVersionSettings = languageVersionSettings,
-                        disableTailCallOptimizationForFunctionReturningUnit = false
+                        disableTailCallOptimizationForFunctionReturningUnit = false,
+                        useOldSpilledVarTypeAnalysis = state.configuration.getBoolean(JVMConfigurationKeys.USE_OLD_SPILLED_VAR_TYPE_ANALYSIS)
                     )
                     val maybeWithForInline = if (forInline)
                         SuspendForInlineCopyingMethodVisitor(stateMachineBuilder, access, name, desc, functionCodegen::newMethod)

compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/CoroutineTransformerMethodVisitor.kt

@@ -5,14 +5,10 @@
 
 package org.jetbrains.kotlin.codegen.coroutines
 
-import org.jetbrains.kotlin.codegen.AsmUtil
-import org.jetbrains.kotlin.codegen.ClassBuilder
-import org.jetbrains.kotlin.codegen.StackValue
-import org.jetbrains.kotlin.codegen.TransformationMethodVisitor
+import org.jetbrains.kotlin.codegen.*
 import org.jetbrains.kotlin.codegen.inline.*
 import org.jetbrains.kotlin.codegen.optimization.common.*
 import org.jetbrains.kotlin.codegen.optimization.fixStack.FixStackMethodTransformer
-import org.jetbrains.kotlin.codegen.linkWithLabel
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.config.isReleaseCoroutines
 import org.jetbrains.kotlin.resolve.jvm.AsmTypes
@@ -65,7 +61,9 @@ class CoroutineTransformerMethodVisitor(
     // May differ from containingClassInternalName in case of DefaultImpls
     private val internalNameForDispatchReceiver: String? = null,
     // JVM_IR backend generates $completion, while old backend does not
-    private val putContinuationParameterToLvt: Boolean = true
+    private val putContinuationParameterToLvt: Boolean = true,
+    // New SourceInterpreter-less analyser can be somewhat unstable, disable it
+    private val useOldSpilledVarTypeAnalysis: Boolean = false
 ) : TransformationMethodVisitor(delegate, access, name, desc, signature, exceptions) {
 
     private val classBuilderForCoroutineState: ClassBuilder by lazy(obtainClassBuilderForCoroutineState)
@@ -594,7 +592,10 @@ class CoroutineTransformerMethodVisitor(
 
     private fun spillVariables(suspensionPoints: List<SuspensionPoint>, methodNode: MethodNode): List<List<SpilledVariableDescriptor>> {
         val instructions = methodNode.instructions
-        val frames = performRefinedTypeAnalysis(methodNode, containingClassInternalName)
+        val frames =
+            if (useOldSpilledVarTypeAnalysis) performRefinedTypeAnalysis(methodNode, containingClassInternalName)
+            else performSpilledVariableFieldTypesAnalysis(methodNode, containingClassInternalName)
+
         fun AbstractInsnNode.index() = instructions.indexOf(this)
 
         // We postpone these actions because they change instruction indices that we use when obtaining frames
@@ -642,11 +643,11 @@ class CoroutineTransformerMethodVisitor(
                     .map { Pair(it, frame.getLocal(it)) }
                     .filter { (index, value) ->
                         (index == 0 && needDispatchReceiver && isForNamedFunction) ||
-                                (value != StrictBasicValue.UNINITIALIZED_VALUE && livenessFrame.isAlive(index))
+                                (value.type != null && livenessFrame.isAlive(index))
                     }
 
             for ((index, basicValue) in variablesToSpill) {
-                if (basicValue === StrictBasicValue.NULL_VALUE) {
+                if (basicValue.type == NULL_TYPE) {
                     postponedActions.add {
                         with(instructions) {
                             insert(suspension.tryCatchBlockEndLabelAfterSuspensionCall, withInstructionAdapter {
@@ -658,7 +659,7 @@ class CoroutineTransformerMethodVisitor(
                     continue
                 }
 
-                val type = basicValue.type
+                val type = basicValue.type!!
                 val normalizedType = type.normalize()
 
                 val indexBySort = varsCountByType[normalizedType]?.plus(1) ?: 0

compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/RedundantLocalsEliminationMethodTransformer.kt

@@ -18,7 +18,6 @@ import org.jetbrains.org.objectweb.asm.Type
 import org.jetbrains.org.objectweb.asm.tree.*
 import org.jetbrains.org.objectweb.asm.tree.analysis.BasicInterpreter
 import org.jetbrains.org.objectweb.asm.tree.analysis.BasicValue
-import org.jetbrains.org.objectweb.asm.tree.analysis.Frame
 
 private class PossibleSpilledValue(val source: AbstractInsnNode, type: Type?) : BasicValue(type) {
     val usages = mutableSetOf<AbstractInsnNode>()

compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/SpilledVariableFieldTypesAnalysis.kt

@@ -0,0 +1,369 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.codegen.coroutines
+
+import org.jetbrains.kotlin.codegen.inline.insnOpcodeText
+import org.jetbrains.kotlin.codegen.inline.isFakeLocalVariableForInline
+import org.jetbrains.kotlin.codegen.optimization.common.MethodAnalyzer
+import org.jetbrains.kotlin.resolve.jvm.AsmTypes
+import org.jetbrains.org.objectweb.asm.Opcodes.*
+import org.jetbrains.org.objectweb.asm.Type
+import org.jetbrains.org.objectweb.asm.tree.*
+import org.jetbrains.org.objectweb.asm.tree.analysis.BasicValue
+import org.jetbrains.org.objectweb.asm.tree.analysis.Frame
+import org.jetbrains.org.objectweb.asm.tree.analysis.Interpreter
+import org.jetbrains.org.objectweb.asm.tree.analysis.Value
+
+// BasicValue interpreter from ASM does not distinct 'int' types from other int-like types like 'byte' or 'boolean',
+// neither do HotSpot and JVM spec.
+// But it seems like Dalvik does not follow it, and spilling boolean value into an 'int' field fails with VerifyError on Android 4,
+// so this function calculates refined frames' markup.
+// Note that type of some values is only possible to determine by their usages (e.g. ICONST_1, BALOAD both may push boolean or byte on stack)
+// In this case, update the type of the value.
+
+// StrictBasicValue with mutable type
+internal open class SpilledVariableFieldTypeValue(open var type: Type?, val insn: AbstractInsnNode?) : Value {
+    override fun getSize(): Int = type?.size ?: 1
+
+    override fun equals(other: Any?): Boolean = other is SpilledVariableFieldTypeValue && type == other.type && insn == other.insn
+
+    override fun hashCode(): Int = (type?.hashCode() ?: 0) xor insn.hashCode()
+
+    override fun toString() = if (type == null) "." else "$type"
+}
+
+private class MergedSpilledVariableFieldTypeValue(
+    val values: Set<SpilledVariableFieldTypeValue>
+) : SpilledVariableFieldTypeValue(null, null) {
+    override var type: Type?
+        get() = values.first().type
+        set(newType) {
+            for (value in values) {
+                value.type = newType
+            }
+        }
+
+    override fun equals(other: Any?): Boolean = other is MergedSpilledVariableFieldTypeValue && other.values == values
+
+    override fun hashCode(): Int = values.hashCode()
+
+    override fun toString(): String = "M$values"
+}
+
+// $i$a and $i$f variables should be ignored in merge operation, since they are not used, but set only
+private class FakeInlinerVariableValue(insn: AbstractInsnNode) : SpilledVariableFieldTypeValue(Type.INT_TYPE, insn) {
+    override fun toString(): String = "@"
+}
+
+private operator fun SpilledVariableFieldTypeValue?.plus(other: SpilledVariableFieldTypeValue?): SpilledVariableFieldTypeValue? = when {
+    this == null -> other
+    other == null -> this
+    this == other -> this
+    this is MergedSpilledVariableFieldTypeValue -> {
+        if (other is MergedSpilledVariableFieldTypeValue) MergedSpilledVariableFieldTypeValue(values + other.values)
+        else MergedSpilledVariableFieldTypeValue(values + other)
+    }
+    other is MergedSpilledVariableFieldTypeValue -> MergedSpilledVariableFieldTypeValue(other.values + this)
+    else -> MergedSpilledVariableFieldTypeValue(setOf(this, other))
+}
+
+internal val NULL_TYPE = Type.getObjectType("null")
+
+// Same as BasicInterpreter, but updates types based on usages
+private class SpilledVariableFieldTypesInterpreter(
+    private val methodNode: MethodNode
+) : Interpreter<SpilledVariableFieldTypeValue>(API_VERSION) {
+    override fun newValue(type: Type?): SpilledVariableFieldTypeValue? =
+        if (type == Type.VOID_TYPE) null else SpilledVariableFieldTypeValue(type, null)
+
+    // INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC, INVOKEINTERFACE,
+    // MULTIANEWARRAY and INVOKEDYNAMIC
+    override fun naryOperation(
+        insn: AbstractInsnNode,
+        values: MutableList<out SpilledVariableFieldTypeValue?>
+    ): SpilledVariableFieldTypeValue? {
+        fun updateTypes(argTypes: Array<Type>, withReceiver: Boolean) {
+            val offset = if (withReceiver) 1 else 0
+            for ((index, argType) in argTypes.withIndex()) {
+                val value = values[index + offset] ?: continue
+                if (argType.isIntType()) {
+                    value.type = argType
+                } else if (
+                    (value.type == AsmTypes.OBJECT_TYPE && argType != AsmTypes.OBJECT_TYPE) ||
+                    value.type == NULL_TYPE || value.type == null
+                ) {
+                    value.type = argType
+                }
+            }
+        }
+
+        return SpilledVariableFieldTypeValue(
+            when (insn.opcode) {
+                MULTIANEWARRAY -> {
+                    Type.getType((insn as MultiANewArrayInsnNode).desc)
+                }
+                INVOKEDYNAMIC -> {
+                    updateTypes(Type.getArgumentTypes((insn as InvokeDynamicInsnNode).desc), false)
+                    Type.getReturnType(insn.desc)
+                }
+                INVOKESTATIC -> {
+                    updateTypes(Type.getArgumentTypes((insn as MethodInsnNode).desc), false)
+                    Type.getReturnType(insn.desc)
+                }
+                INVOKEVIRTUAL, INVOKEINTERFACE, INVOKESPECIAL -> {
+                    updateTypes(Type.getArgumentTypes((insn as MethodInsnNode).desc), true)
+                    Type.getReturnType(insn.desc)
+                }
+                else -> {
+                    unreachable(insn)
+                }
+            }, insn
+        )
+    }
+
+    private fun Type.isIntType(): Boolean = when (sort) {
+        Type.BOOLEAN, Type.BYTE, Type.CHAR, Type.SHORT, Type.INT -> true
+        else -> false
+    }
+
+    private fun unreachable(insn: AbstractInsnNode): Nothing = error("Unreachable instruction ${insn.insnOpcodeText}")
+
+    // IASTORE, LASTORE, FASTORE, DASTORE, AASTORE, BASTORE, CASTORE, SASTORE
+    override fun ternaryOperation(
+        insn: AbstractInsnNode,
+        arrayref: SpilledVariableFieldTypeValue?,
+        index: SpilledVariableFieldTypeValue?,
+        value: SpilledVariableFieldTypeValue?
+    ): SpilledVariableFieldTypeValue? {
+        when (insn.opcode) {
+            IASTORE, LASTORE, FASTORE, DASTORE, AASTORE -> {
+                // nothing to do
+            }
+            BASTORE -> {
+                value?.type = if (arrayref?.type?.descriptor == "[Z") Type.BOOLEAN_TYPE else Type.BYTE_TYPE
+            }
+            CASTORE -> {
+                value?.type = Type.CHAR_TYPE
+            }
+            SASTORE -> {
+                value?.type = Type.SHORT_TYPE
+            }
+            else -> unreachable(insn)
+        }
+        return null
+    }
+
+    override fun merge(v: SpilledVariableFieldTypeValue?, w: SpilledVariableFieldTypeValue?): SpilledVariableFieldTypeValue? =
+        when {
+            v is FakeInlinerVariableValue -> w
+            w is FakeInlinerVariableValue -> v
+            v?.type?.isIntType() == true && w?.type?.isIntType() == true -> v + w
+            v != null && v.type == null -> w
+            w != null && w.type == null -> v
+            v?.type == w?.type -> v
+            v?.type?.sort == Type.OBJECT && w?.type?.sort == Type.OBJECT -> {
+                when {
+                    v.type == AsmTypes.OBJECT_TYPE -> v
+                    w.type == AsmTypes.OBJECT_TYPE -> w
+                    else -> SpilledVariableFieldTypeValue(AsmTypes.OBJECT_TYPE, v.insn)
+                }
+            }
+            else -> SpilledVariableFieldTypeValue(null, v?.insn ?: w?.insn)
+        }
+
+    // IRETURN, LRETURN, FRETURN, DRETURN, ARETURN
+    override fun returnOperation(insn: AbstractInsnNode, value: SpilledVariableFieldTypeValue?, expected: SpilledVariableFieldTypeValue?) {
+        if (insn.opcode == IRETURN) {
+            value?.type = expected?.type
+        }
+    }
+
+    // INEG, LNEG, FNEG, DNEG, IINC, I2L, I2F, I2D, L2I, L2F, L2D, F2I, F2L,
+    // F2D, D2I, D2L, D2F, I2B, I2C, I2S, IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE,
+    // TABLESWITCH, LOOKUPSWITCH, IRETURN, LRETURN, FRETURN, DRETURN, ARETURN,
+    // PUTSTATIC, GETFIELD, NEWARRAY, ANEWARRAY, ARRAYLENGTH, ATHROW, CHECKCAST,
+    // INSTANCEOF, MONITORENTER, MONITOREXIT, IFNULL, IFNONNULL
+    override fun unaryOperation(insn: AbstractInsnNode, value: SpilledVariableFieldTypeValue?): SpilledVariableFieldTypeValue? =
+        when (insn.opcode) {
+            INEG, LNEG, FNEG, DNEG, IINC -> SpilledVariableFieldTypeValue(value?.type, insn)
+            I2L, F2L, D2L -> SpilledVariableFieldTypeValue(Type.LONG_TYPE, insn)
+            I2F, L2F, D2F -> SpilledVariableFieldTypeValue(Type.FLOAT_TYPE, insn)
+            L2D, I2D, F2D -> SpilledVariableFieldTypeValue(Type.DOUBLE_TYPE, insn)
+            L2I, F2I, D2I, ARRAYLENGTH -> SpilledVariableFieldTypeValue(Type.INT_TYPE, insn)
+            I2B -> SpilledVariableFieldTypeValue(Type.BYTE_TYPE, insn)
+            I2C -> SpilledVariableFieldTypeValue(Type.CHAR_TYPE, insn)
+            I2S -> SpilledVariableFieldTypeValue(Type.SHORT_TYPE, insn)
+            IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE, TABLESWITCH, LOOKUPSWITCH, IRETURN, LRETURN, FRETURN, DRETURN, ARETURN,
+            ATHROW, MONITORENTER, MONITOREXIT, IFNULL, IFNONNULL -> null
+            PUTSTATIC -> {
+                val expectedType = Type.getType((insn as FieldInsnNode).desc)
+                if (expectedType.isIntType()) {
+                    value?.type = expectedType
+                }
+                null
+            }
+            GETFIELD -> SpilledVariableFieldTypeValue(Type.getType((insn as FieldInsnNode).desc), insn)
+            NEWARRAY -> when ((insn as IntInsnNode).operand) {
+                T_BOOLEAN -> SpilledVariableFieldTypeValue(Type.getType("[Z"), insn)
+                T_CHAR -> SpilledVariableFieldTypeValue(Type.getType("[C"), insn)
+                T_BYTE -> SpilledVariableFieldTypeValue(Type.getType("[B"), insn)
+                T_SHORT -> SpilledVariableFieldTypeValue(Type.getType("[S"), insn)
+                T_INT -> SpilledVariableFieldTypeValue(Type.getType("[I"), insn)
+                T_FLOAT -> SpilledVariableFieldTypeValue(Type.getType("[F"), insn)
+                T_DOUBLE -> SpilledVariableFieldTypeValue(Type.getType("[D"), insn)
+                T_LONG -> SpilledVariableFieldTypeValue(Type.getType("[J"), insn)
+                else -> unreachable(insn)
+            }
+            ANEWARRAY -> SpilledVariableFieldTypeValue(Type.getType("[${Type.getObjectType((insn as TypeInsnNode).desc)}"), insn)
+            CHECKCAST -> SpilledVariableFieldTypeValue(Type.getObjectType((insn as TypeInsnNode).desc), insn)
+            INSTANCEOF -> SpilledVariableFieldTypeValue(Type.BOOLEAN_TYPE, insn)
+            else -> unreachable(insn)
+        }
+
+    // IALOAD, LALOAD, FALOAD, DALOAD, AALOAD, BALOAD, CALOAD, SALOAD, IADD,
+    // LADD, FADD, DADD, ISUB, LSUB, FSUB, DSUB, IMUL, LMUL, FMUL, DMUL, IDIV,
+    // LDIV, FDIV, DDIV, IREM, LREM, FREM, DREM, ISHL, LSHL, ISHR, LSHR, IUSHR,
+    // LUSHR, IAND, LAND, IOR, LOR, IXOR, LXOR, LCMP, FCMPL, FCMPG, DCMPL,
+    // DCMPG, IF_ICMPEQ, IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE,
+    // IF_ACMPEQ, IF_ACMPNE, PUTFIELD
+    override fun binaryOperation(
+        insn: AbstractInsnNode,
+        v: SpilledVariableFieldTypeValue?,
+        w: SpilledVariableFieldTypeValue?
+    ): SpilledVariableFieldTypeValue? = when (insn.opcode) {
+        IALOAD, IADD, ISUB, IMUL, IDIV, IREM, ISHL, ISHR, IUSHR, IAND, IOR, IXOR, LCMP, FCMPL, FCMPG, DCMPL,
+        DCMPG -> SpilledVariableFieldTypeValue(Type.INT_TYPE, insn)
+        LALOAD, LADD, LSUB, LMUL, LDIV, LREM, LSHL, LSHR, LUSHR, LAND, LOR, LXOR -> SpilledVariableFieldTypeValue(Type.LONG_TYPE, insn)
+        FALOAD, FADD, FSUB, FMUL, FDIV, FREM -> SpilledVariableFieldTypeValue(Type.FLOAT_TYPE, insn)
+        DALOAD, DADD, DSUB, DMUL, DDIV, DREM -> SpilledVariableFieldTypeValue(Type.DOUBLE_TYPE, insn)
+        AALOAD -> SpilledVariableFieldTypeValue(AsmTypes.OBJECT_TYPE, insn)
+        BALOAD -> SpilledVariableFieldTypeValue(if (v?.type?.descriptor == "[Z") Type.BOOLEAN_TYPE else Type.BYTE_TYPE, insn)
+        CALOAD -> SpilledVariableFieldTypeValue(Type.CHAR_TYPE, insn)
+        SALOAD -> SpilledVariableFieldTypeValue(Type.SHORT_TYPE, insn)
+        IF_ICMPEQ, IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, IF_ACMPEQ, IF_ACMPNE -> null
+        PUTFIELD -> {
+            val expectedType = Type.getType((insn as FieldInsnNode).desc)
+            if (expectedType.isIntType()) {
+                w?.type = expectedType
+            }
+            null
+        }
+        else -> unreachable(insn)
+    }
+
+    // ILOAD, LLOAD, FLOAD, DLOAD, ALOAD, ISTORE, LSTORE, FSTORE, DSTORE,
+    // ASTORE, DUP, DUP_X1, DUP_X2, DUP2, DUP2_X1, DUP2_X2, SWAP
+    override fun copyOperation(insn: AbstractInsnNode, value: SpilledVariableFieldTypeValue?): SpilledVariableFieldTypeValue? {
+        return when (insn.opcode) {
+            // If same ICONST is stored into several slots, thay can have different types
+            // For example,
+            //  val b: Byte = 1
+            //  val i: Int = b.toInt()
+            // In this case, `b` and `i` have the same source, but different types.
+            // The example also shows, that the types should be `I`.
+            ISTORE -> {
+                if (value is FakeInlinerVariableValue && insn.previous.opcode == ICONST_0) return value
+                findLvtRecord((insn as VarInsnNode).`var`, insn)?.let {
+                    if (Type.getType(it.desc) == value?.type) return value
+                }
+                var current: AbstractInsnNode? = insn
+                while (current != null && current !is LabelNode) {
+                    current = current.next
+                }
+                while (current is LabelNode) {
+                    findLvtRecord(insn.`var`, current)?.let {
+                        if (Type.getType(it.desc) == value?.type) return value
+                    }
+                    current = current.next
+                }
+                if (value?.type == Type.INT_TYPE) return value
+                SpilledVariableFieldTypeValue(Type.INT_TYPE, insn)
+            }
+            // Sometimes we cannot get the type from the usage only
+            // For example,
+            //  val c = '1'
+            //  if (c == '2) ...
+            // In this case, update the type using information from LVT
+            ILOAD -> {
+                if (value is FakeInlinerVariableValue) return SpilledVariableFieldTypeValue(value.type, value.insn)
+                findLvtRecord((insn as VarInsnNode).`var`, insn)?.let { value?.type = Type.getType(it.desc) }
+                value
+            }
+            else -> value
+        }
+    }
+
+    private fun findLvtRecord(index: Int, insn: AbstractInsnNode): LocalVariableNode? = methodNode.localVariables.find { local ->
+        local.index == index &&
+                methodNode.instructions.indexOf(local.start) <= methodNode.instructions.indexOf(insn) &&
+                methodNode.instructions.indexOf(insn) < methodNode.instructions.indexOf(local.end)
+    }
+
+    // ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1, ICONST_2, ICONST_3, ICONST_4,
+    // ICONST_5, LCONST_0, LCONST_1, FCONST_0, FCONST_1, FCONST_2, DCONST_0,
+    // DCONST_1, BIPUSH, SIPUSH, LDC, JSR, GETSTATIC, NEW
+    override fun newOperation(insn: AbstractInsnNode): SpilledVariableFieldTypeValue? {
+        return when (insn.opcode) {
+            ICONST_0 -> {
+                if (insn.next?.opcode == ISTORE) {
+                    // Find out, whether this is fake inliner variable
+                    // Unlike old JVM BE, JVM_IR does not generate them in a specific pattern,
+                    // that we can just recognize.
+                    // So, run instructions until LabelNode and check whether this is, in fact, fake inliner variable
+                    if (findLvtRecord((insn.next as VarInsnNode).`var`, insn.next) != null) {
+                        return SpilledVariableFieldTypeValue(Type.INT_TYPE, insn)
+                    }
+                    var current: AbstractInsnNode? = insn.next?.next
+                    while (current != null && current !is LabelNode) {
+                        current = current.next
+                    }
+                    while (current is LabelNode) {
+                        val lvtRecord = findLvtRecord((insn.next as VarInsnNode).`var`, current)
+                        // fake variables do not have LVT entry is they are inside `run` or `apply`
+                        if (lvtRecord == null || isFakeLocalVariableForInline(lvtRecord.name)) {
+                            return FakeInlinerVariableValue(insn)
+                        }
+                        current = current.next
+                    }
+                }
+                SpilledVariableFieldTypeValue(Type.INT_TYPE, insn)
+            }
+            ACONST_NULL -> SpilledVariableFieldTypeValue(NULL_TYPE, insn)
+            ICONST_M1, ICONST_1, ICONST_2, ICONST_3, ICONST_4, ICONST_5 -> SpilledVariableFieldTypeValue(Type.INT_TYPE, insn)
+            LCONST_0, LCONST_1 -> SpilledVariableFieldTypeValue(Type.LONG_TYPE, insn)
+            FCONST_0, FCONST_1, FCONST_2 -> SpilledVariableFieldTypeValue(Type.FLOAT_TYPE, insn)
+            DCONST_0, DCONST_1 -> SpilledVariableFieldTypeValue(Type.DOUBLE_TYPE, insn)
+            BIPUSH -> SpilledVariableFieldTypeValue(Type.BYTE_TYPE, insn)
+            SIPUSH -> SpilledVariableFieldTypeValue(Type.SHORT_TYPE, insn)
+            LDC -> when ((insn as LdcInsnNode).cst) {
+                is Int -> SpilledVariableFieldTypeValue(Type.INT_TYPE, insn)
+                is Long -> SpilledVariableFieldTypeValue(Type.LONG_TYPE, insn)
+                is Float -> SpilledVariableFieldTypeValue(Type.FLOAT_TYPE, insn)
+                is Double -> SpilledVariableFieldTypeValue(Type.DOUBLE_TYPE, insn)
+                is String -> SpilledVariableFieldTypeValue(AsmTypes.JAVA_STRING_TYPE, insn)
+                is Type -> SpilledVariableFieldTypeValue(AsmTypes.JAVA_CLASS_TYPE, insn)
+                else -> SpilledVariableFieldTypeValue(AsmTypes.OBJECT_TYPE, insn)
+            }
+            JSR -> SpilledVariableFieldTypeValue(Type.VOID_TYPE, insn)
+            GETSTATIC -> SpilledVariableFieldTypeValue(Type.getType((insn as FieldInsnNode).desc), insn)
+            NEW -> SpilledVariableFieldTypeValue(Type.getObjectType((insn as TypeInsnNode).desc), insn)
+            else -> unreachable(insn)
+        }
+    }
+}
+
+internal fun performSpilledVariableFieldTypesAnalysis(
+    methodNode: MethodNode,
+    thisName: String
+): Array<out Frame<SpilledVariableFieldTypeValue>?> =
+    MethodAnalyzer(thisName, methodNode, SpilledVariableFieldTypesInterpreter(methodNode)).analyze()
+
+internal val Value.type: Type?
+    get() = when (this) {
+        is BasicValue -> type
+        is SpilledVariableFieldTypeValue -> type
+        else -> error("Unexpected type of $this")
+    }

compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/SuspendFunctionGenerationStrategy.kt

@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.codegen.inline.addFakeContinuationConstructorCallMar
 import org.jetbrains.kotlin.codegen.inline.coroutines.FOR_INLINE_SUFFIX
 import org.jetbrains.kotlin.codegen.inline.preprocessSuspendMarkers
 import org.jetbrains.kotlin.codegen.state.GenerationState
+import org.jetbrains.kotlin.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.config.JVMConstructorCallNormalizationMode
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.config.languageVersionSettings
@@ -95,7 +96,8 @@ class SuspendFunctionGenerationStrategy(
             languageVersionSettings = languageVersionSettings,
             disableTailCallOptimizationForFunctionReturningUnit = originalSuspendDescriptor.returnType?.isUnit() == true &&
                     originalSuspendDescriptor.overriddenDescriptors.isNotEmpty() &&
-                    !originalSuspendDescriptor.allOverriddenFunctionsReturnUnit()
+                    !originalSuspendDescriptor.allOverriddenFunctionsReturnUnit(),
+            useOldSpilledVarTypeAnalysis = state.configuration.getBoolean(JVMConfigurationKeys.USE_OLD_SPILLED_VAR_TYPE_ANALYSIS)
         )
     }
 

compiler/backend/src/org/jetbrains/kotlin/codegen/coroutines/refinedIntTypesAnalysis.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/coroutines/CoroutineTransformer.kt

@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.codegen.coroutines.*
 import org.jetbrains.kotlin.codegen.inline.*
 import org.jetbrains.kotlin.codegen.optimization.common.asSequence
 import org.jetbrains.kotlin.codegen.optimization.transformer.MethodTransformer
+import org.jetbrains.kotlin.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.config.isReleaseCoroutines
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
@@ -95,7 +96,8 @@ class CoroutineTransformer(
                 shouldPreserveClassInitialization = state.constructorCallNormalizationMode.shouldPreserveClassInitialization,
                 containingClassInternalName = classBuilder.thisName,
                 isForNamedFunction = false,
-                disableTailCallOptimizationForFunctionReturningUnit = false
+                disableTailCallOptimizationForFunctionReturningUnit = false,
+                useOldSpilledVarTypeAnalysis = state.configuration.getBoolean(JVMConfigurationKeys.USE_OLD_SPILLED_VAR_TYPE_ANALYSIS)
             )
 
             if (generateForInline)
@@ -131,7 +133,8 @@ class CoroutineTransformer(
                 needDispatchReceiver = true,
                 internalNameForDispatchReceiver = classBuilder.thisName,
                 disableTailCallOptimizationForFunctionReturningUnit = disableTailCallOptimization,
-                putContinuationParameterToLvt = !state.isIrBackend
+                putContinuationParameterToLvt = !state.isIrBackend,
+                useOldSpilledVarTypeAnalysis = state.configuration.getBoolean(JVMConfigurationKeys.USE_OLD_SPILLED_VAR_TYPE_ANALYSIS)
             )
 
             if (generateForInline)

compiler/backend/src/org/jetbrains/kotlin/codegen/signature/AsmTypeFactory.kt

@@ -16,16 +16,27 @@
 
 package org.jetbrains.kotlin.codegen.signature
 
+import org.jetbrains.kotlin.builtins.PrimitiveType
 import org.jetbrains.kotlin.codegen.AsmUtil
 import org.jetbrains.kotlin.load.kotlin.JvmTypeFactory
 import org.jetbrains.kotlin.resolve.jvm.AsmTypes
 import org.jetbrains.org.objectweb.asm.Type
 
 object AsmTypeFactory : JvmTypeFactory<Type> {
-    override fun boxType(possiblyPrimitiveType: Type) = AsmUtil.boxType(possiblyPrimitiveType)
-    override fun createFromString(representation: String) = Type.getType(representation)
-    override fun createObjectType(internalName: String) = Type.getObjectType(internalName)
-    override fun toString(type: Type) = type.descriptor
+    override fun boxType(possiblyPrimitiveType: Type): Type =
+        AsmUtil.boxType(possiblyPrimitiveType)
+
+    override fun createFromString(representation: String): Type =
+        Type.getType(representation)
+
+    override fun createPrimitiveType(primitiveType: PrimitiveType): Type =
+        AsmTypes.valueTypeForPrimitive(primitiveType)
+
+    override fun createObjectType(internalName: String): Type =
+        Type.getObjectType(internalName)
+
+    override fun toString(type: Type): String =
+        type.descriptor
 
     override val javaLangClassType: Type
         get() = AsmTypes.JAVA_CLASS_TYPE

compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt

@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.serialization.builtins
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.builtins.BuiltInsBinaryVersion
 import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
+import org.jetbrains.kotlin.serialization.AnnotationSerializer
 import org.jetbrains.kotlin.serialization.KotlinSerializerExtensionBase
 import org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInSerializerProtocol
 import org.jetbrains.kotlin.types.KotlinType
@@ -31,20 +32,29 @@ class BuiltInsSerializerExtension : KotlinSerializerExtensionBase(BuiltInSeriali
         "CharRange" to "kotlin/ranges/CharRange"
     )
 
+    override fun createAnnotationSerializer(): AnnotationSerializer = object : AnnotationSerializer(stringTable) {
+        override fun ignoreAnnotation(type: KotlinType): Boolean =
+            type.presentableName == "JvmStatic" || type.presentableName == "JvmField" || super.ignoreAnnotation(type)
+    }
+
     override val metadataVersion: BinaryVersion
         get() = BuiltInsBinaryVersion.INSTANCE
 
     override fun shouldUseTypeTable(): Boolean = true
 
     override fun serializeErrorType(type: KotlinType, builder: ProtoBuf.Type.Builder) {
-        val unwrapped = type.unwrap()
-        if (unwrapped !is UnresolvedType) {
-            throw UnsupportedOperationException("Error types which are not UnresolvedType instances are not supported here: $unwrapped")
-        }
-
-        val className = shortNameToClassId[unwrapped.presentableName]
-                ?: throw UnsupportedOperationException("Unsupported unresolved type: $unwrapped")
+        val className = shortNameToClassId[type.presentableName]
+            ?: throw UnsupportedOperationException("Unsupported unresolved type: ${type.unwrap()}")
 
         builder.className = stringTable.getQualifiedClassNameIndex(className, false)
     }
+
+    private val KotlinType.presentableName: String
+        get() {
+            val unwrapped = unwrap()
+            if (unwrapped !is UnresolvedType) {
+                throw UnsupportedOperationException("Error types which are not UnresolvedType instances are not supported here: $unwrapped")
+            }
+            return unwrapped.presentableName
+        }
 }

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt

@@ -340,6 +340,12 @@ abstract class CommonCompilerArguments : CommonToolArguments() {
     )
     var explicitApi: String by FreezableVar(ExplicitApiMode.DISABLED.state)
 
+    @Argument(
+        value = "-Xdeserialize-fake-overrides",
+        description = "Fallback to deserializing fake overrides"
+    )
+    var deserializeFakeOverrides: Boolean by FreezableVar(false)
+
     open fun configureAnalysisFlags(collector: MessageCollector): MutableMap<AnalysisFlag<*>, Any> {
         return HashMap<AnalysisFlag<*>, Any>().apply {
             put(AnalysisFlags.skipMetadataVersionCheck, skipMetadataVersionCheck)

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.kt

@@ -135,6 +135,9 @@ class K2JSCompilerArguments : CommonCompilerArguments() {
     )
     var irModuleName: String? by NullableStringFreezableVar(null)
 
+    @Argument(value = "-Xir-per-module", description = "Splits generated .js per-module")
+    var irPerModule: Boolean by FreezableVar(false)
+
     @Argument(
         value = "-Xinclude",
         valueDescription = "<path>",
@@ -169,6 +172,9 @@ class K2JSCompilerArguments : CommonCompilerArguments() {
     @Argument(value = "-Xenable-js-scripting", description = "Enable experimental support of .kts files using K/JS (with -Xir only)")
     var enableJsScripting: Boolean by FreezableVar(false)
 
+    @Argument(value = "-Xdisable-fake-override-validator", description = "Disable IR fake override validator")
+    var disableFakeOverrideValidator: Boolean by FreezableVar(false)
+
     override fun checkIrSupport(languageVersionSettings: LanguageVersionSettings, collector: MessageCollector) {
         if (!isIrBackendEnabled()) return
 

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt

@@ -369,6 +369,12 @@ class K2JVMCompilerArguments : CommonCompilerArguments() {
     )
     var repeatCompileModules: String? by NullableStringFreezableVar(null)
 
+    @Argument(
+        value = "-Xuse-old-spilled-var-type-analysis",
+        description = "Use old, SourceInterpreter-based analysis for fields, used for spilled variables in coroutines"
+    )
+    var useOldSpilledVarTypeAnalysis: Boolean by FreezableVar(false)
+
     override fun configureAnalysisFlags(collector: MessageCollector): MutableMap<AnalysisFlag<*>, Any> {
         val result = super.configureAnalysisFlags(collector)
         result[JvmAnalysisFlags.strictMetadataVersionSemantics] = strictMetadataVersionSemantics

compiler/cli/cli-common/src/org/jetbrains/kotlin/utils/parametersMap.kt

@@ -63,8 +63,8 @@ private interface ArgsConverter<T> {
     }
 
     fun tryConvertSingle(parameter: KParameter, arg: NamedArgument<T>): Result
-    fun tryConvertVararg(parameter: KParameter, firstArg: NamedArgument<T>, restArgsIt: Iterator<NamedArgument<T>>): Result
-    fun tryConvertTail(parameter: KParameter, firstArg: NamedArgument<T>, restArgsIt: Iterator<NamedArgument<T>>): Result
+    fun tryConvertVararg(parameter: KParameter, firstArg: NamedArgument<T>, restArgs: Sequence<NamedArgument<T>>): Result
+    fun tryConvertTail(parameter: KParameter, firstArg: NamedArgument<T>, restArgs: Sequence<NamedArgument<T>>): Result
 }
 
 private enum class ArgsTraversalState { UNNAMED, NAMED, TAIL }
@@ -77,7 +77,7 @@ private fun <T> tryCreateCallableMapping(
     val res = mutableMapOf<KParameter, Any?>()
     var state = ArgsTraversalState.UNNAMED
     val unboundParams = callable.parameters.toMutableList()
-    val argIt = args.iterator()
+    val argIt = LookAheadIterator(args.iterator())
     while (argIt.hasNext()) {
         if (unboundParams.isEmpty()) return null // failed to match: no param left for the arg
         val arg = argIt.next()
@@ -102,7 +102,11 @@ private fun <T> tryCreateCallableMapping(
                     res[par] = cvtRes.v
                 } else if (par.type.jvmErasure.java.isArray) {
                     // try vararg
-                    val cvtVRes = converter.tryConvertVararg(par, arg, argIt)
+
+                    // Collect all the arguments that do not have a name
+                    val unnamed = argIt.sequenceUntil { it.name != null }
+
+                    val cvtVRes = converter.tryConvertVararg(par, arg, unnamed)
                     if (cvtVRes is ArgsConverter.Result.Success) {
                         res[par] = cvtVRes.v
                     } else return null // failed to match: no suitable param for unnamed arg
@@ -121,7 +125,7 @@ private fun <T> tryCreateCallableMapping(
             ArgsTraversalState.TAIL -> {
                 assert(arg.name == null)
                 val par = unboundParams.removeAt(unboundParams.lastIndex)
-                val cvtVRes = converter.tryConvertTail(par, arg, argIt)
+                val cvtVRes = converter.tryConvertTail(par, arg, argIt.asSequence())
                 if (cvtVRes is ArgsConverter.Result.Success) {
                     if (argIt.hasNext()) return null // failed to match: not all tail args are consumed
                     res[par] = cvtVRes.v
@@ -162,7 +166,7 @@ private class StringArgsConverter : ArgsConverter<String> {
     override fun tryConvertVararg(
         parameter: KParameter,
         firstArg: NamedArgument<String>,
-        restArgsIt: Iterator<NamedArgument<String>>
+        restArgs: Sequence<NamedArgument<String>>
     ): ArgsConverter.Result {
         fun convertPrimitivesArray(type: KType, args: Sequence<String?>): Any? =
             when (type.classifier) {
@@ -179,7 +183,7 @@ private class StringArgsConverter : ArgsConverter<String> {
 
         val parameterType = parameter.type
         if (parameterType.jvmErasure.java.isArray) {
-            val argsSequence = sequenceOf(firstArg.value) + restArgsIt.asSequence().map { it.value }
+            val argsSequence = sequenceOf(firstArg.value) + restArgs.map { it.value }
             val primArrayArgCandidate = convertPrimitivesArray(parameterType, argsSequence)
             if (primArrayArgCandidate != null)
                 return ArgsConverter.Result.Success(primArrayArgCandidate)
@@ -195,9 +199,9 @@ private class StringArgsConverter : ArgsConverter<String> {
     override fun tryConvertTail(
         parameter: KParameter,
         firstArg: NamedArgument<String>,
-        restArgsIt: Iterator<NamedArgument<String>>
+        restArgs: Sequence<NamedArgument<String>>
     ): ArgsConverter.Result =
-        tryConvertVararg(parameter, firstArg, restArgsIt)
+        tryConvertVararg(parameter, firstArg, restArgs)
 }
 
 private class AnyArgsConverter : ArgsConverter<Any> {
@@ -218,18 +222,33 @@ private class AnyArgsConverter : ArgsConverter<Any> {
                 else -> null
             }
 
-        if (value::class.isSubclassOf(parameter.type.jvmErasure)) return ArgsConverter.Result.Success(value)
+        fun evaluateValue(arg: Any): Any? {
+            if (arg::class.isSubclassOf(parameter.type.jvmErasure)) return arg
+            return convertPrimitivesArray(parameter.type, arg)
+        }
 
-        return convertPrimitivesArray(parameter.type, value)?.let { ArgsConverter.Result.Success(it) }
-            ?: ArgsConverter.Result.Failure
+        evaluateValue(value)?.let { return ArgsConverter.Result.Success(it) }
+
+        // Handle the scenario where [arg::class] is an Array<Any>
+        // but it's values could all still be valid
+        val parameterKClass = parameter.type.classifier as? KClass<*>
+        val arrayComponentType = parameterKClass?.java?.takeIf { it.isArray}?.componentType?.kotlin
+
+        if (value is Array<*> && arrayComponentType != null) {
+            // TODO: Idea! Maybe we should check if the values in the array are compatible with [arrayComponentType]
+            //  if they aren't perhaps we should fail silently
+            convertAnyArray(arrayComponentType, value.asSequence())?.let(::evaluateValue)?.let { return ArgsConverter.Result.Success(it) }
+        }
+
+        return ArgsConverter.Result.Failure
     }
 
     override fun tryConvertVararg(
-        parameter: KParameter, firstArg: NamedArgument<Any>, restArgsIt: Iterator<NamedArgument<Any>>
+        parameter: KParameter, firstArg: NamedArgument<Any>, restArgs: Sequence<NamedArgument<Any>>
     ): ArgsConverter.Result {
         val parameterType = parameter.type
         if (parameterType.jvmErasure.java.isArray) {
-            val argsSequence = sequenceOf(firstArg.value) + restArgsIt.asSequence().map { it.value }
+            val argsSequence = sequenceOf(firstArg.value) + restArgs.map { it.value }
             val arrayElementType = parameterType.arguments.firstOrNull()?.type
             val arrayArgCandidate = convertAnyArray(arrayElementType?.classifier, argsSequence)
             if (arrayArgCandidate != null)
@@ -242,7 +261,7 @@ private class AnyArgsConverter : ArgsConverter<Any> {
     override fun tryConvertTail(
         parameter: KParameter,
         firstArg: NamedArgument<Any>,
-        restArgsIt: Iterator<NamedArgument<Any>>
+        restArgs: Sequence<NamedArgument<Any>>
     ): ArgsConverter.Result =
         tryConvertSingle(parameter, firstArg)
 }
@@ -266,3 +285,38 @@ private fun <T> convertAnyArrayImpl(classifier: KClassifier?, args: Sequence<T?>
     }
     return result
 }
+
+/*
+ An iterator that allows us to read the next value without consuming it.
+ */
+private class LookAheadIterator<T>(private val iterator: Iterator<T>) : Iterator<T> {
+    private var currentLookAhead: T? = null
+
+    override fun hasNext(): Boolean {
+        return currentLookAhead != null || iterator.hasNext()
+    }
+
+    override fun next(): T {
+        currentLookAhead?.let { value ->
+            currentLookAhead = null
+            return value
+        }
+
+        return iterator.next()
+    }
+
+    fun nextWithoutConsuming(): T {
+        return currentLookAhead ?: iterator.next().also { currentLookAhead = it }
+    }
+}
+
+/*
+ Will return a sequence with the values of the iterator until the predicate evaluates to true.
+ */
+private fun <T> LookAheadIterator<T>.sequenceUntil(predicate: (T) -> Boolean): Sequence<T> = sequence {
+    while (hasNext()) {
+        if (predicate(nextWithoutConsuming()))
+            break
+        yield(next())
+    }
+}

compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt

@@ -229,14 +229,19 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
                     mainArguments = mainCallArguments,
                     generateFullJs = !arguments.irDce,
                     generateDceJs = arguments.irDce,
-                    dceDriven = arguments.irDceDriven
+                    dceDriven = arguments.irDceDriven,
+                    multiModule = arguments.irPerModule,
+                    relativeRequirePath = true
                 )
             } catch (e: JsIrCompilationError) {
                 return COMPILATION_ERROR
             }
 
             val jsCode = if (arguments.irDce && !arguments.irDceDriven) compiledModule.dceJsCode!! else compiledModule.jsCode!!
-            outputFile.writeText(jsCode)
+            outputFile.writeText(jsCode.mainModule)
+            jsCode.dependencies.forEach { (name, content) ->
+                outputFile.resolveSibling("$name.js").writeText(content)
+            }
             if (arguments.generateDts) {
                 val dtsFile = outputFile.withReplacedExtensionOrNull(outputFile.extension, "d.ts")!!
                 dtsFile.writeText(compiledModule.tsDefinitions ?: error("No ts definitions"))
@@ -322,6 +327,7 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
         }
 
         configuration.put(JSConfigurationKeys.PRINT_REACHABILITY_INFO, arguments.irDcePrintReachabilityInfo)
+        configuration.put(JSConfigurationKeys.DISABLE_FAKE_OVERRIDE_VALIDATOR, arguments.disableFakeOverrideValidator)
     }
 
     override fun executableScriptFileName(): String {

compiler/cli/src/org/jetbrains/kotlin/cli/common/arguments.kt

@@ -26,6 +26,7 @@ fun <A : CommonCompilerArguments> CompilerConfiguration.setupCommonArguments(
     put(CommonConfigurationKeys.EXPECT_ACTUAL_LINKER, arguments.expectActualLinker)
     putIfNotNull(CLIConfigurationKeys.INTELLIJ_PLUGIN_ROOT, arguments.intellijPluginRoot)
     put(CommonConfigurationKeys.REPORT_OUTPUT_FILES, arguments.reportOutputFiles)
+    put(CommonConfigurationKeys.DESERIALIZE_FAKE_OVERRIDES, arguments.deserializeFakeOverrides)
 
     val metadataVersionString = arguments.metadataVersion
     if (metadataVersionString != null) {

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/TopDownAnalyzerFacadeForJVM.kt

@@ -66,6 +66,7 @@ import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.*
+import org.jetbrains.kotlin.resolve.calls.tower.ImplicitsExtensionsResolutionFilter
 import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver
 import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
 import org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension
@@ -135,7 +136,8 @@ object TopDownAnalyzerFacadeForJVM {
         declarationProviderFactory: (StorageManager, Collection<KtFile>) -> DeclarationProviderFactory,
         targetEnvironment: TargetEnvironment = CompilerEnvironment,
         sourceModuleSearchScope: GlobalSearchScope = newModuleSearchScope(project, files),
-        klibList: List<KotlinLibrary> = emptyList()
+        klibList: List<KotlinLibrary> = emptyList(),
+        implicitsResolutionFilter: ImplicitsExtensionsResolutionFilter? = null
     ): ComponentProvider {
         val jvmTarget = configuration.get(JVMConfigurationKeys.JVM_TARGET, JvmTarget.DEFAULT)
         val languageVersionSettings = configuration.languageVersionSettings
@@ -186,7 +188,8 @@ object TopDownAnalyzerFacadeForJVM {
                 targetEnvironment, lookupTracker, expectActualTracker,
                 packagePartProvider(dependencyScope), languageVersionSettings,
                 useBuiltInsProvider = true,
-                configureJavaClassFinder = configureJavaClassFinder
+                configureJavaClassFinder = configureJavaClassFinder,
+                implicitsResolutionFilter = implicitsResolutionFilter
             )
 
             moduleClassResolver.compiledCodeResolver = dependenciesContainer.get()
@@ -220,7 +223,8 @@ object TopDownAnalyzerFacadeForJVM {
             partProvider, languageVersionSettings,
             useBuiltInsProvider = true,
             configureJavaClassFinder = configureJavaClassFinder,
-            javaClassTracker = configuration[JVMConfigurationKeys.JAVA_CLASSES_TRACKER]
+            javaClassTracker = configuration[JVMConfigurationKeys.JAVA_CLASSES_TRACKER],
+            implicitsResolutionFilter = implicitsResolutionFilter
         ).apply {
             initJvmBuiltInsForTopDownAnalysis()
             (partProvider as? IncrementalPackagePartProvider)?.deserializationConfiguration = get()

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/jvmArguments.kt

@@ -198,6 +198,7 @@ fun CompilerConfiguration.configureAdvancedJvmOptions(arguments: K2JVMCompilerAr
 
     put(CLIConfigurationKeys.ALLOW_KOTLIN_PACKAGE, arguments.allowKotlinPackage)
     put(JVMConfigurationKeys.USE_SINGLE_MODULE, arguments.singleModule)
+    put(JVMConfigurationKeys.USE_OLD_SPILLED_VAR_TYPE_ANALYSIS, arguments.useOldSpilledVarTypeAnalysis)
 
     arguments.declarationsOutputPath?.let { put(JVMConfigurationKeys.DECLARATIONS_JSON_PATH, it) }
 }

compiler/config.jvm/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java

@@ -122,4 +122,7 @@ public class JVMConfigurationKeys {
 
     public static final CompilerConfigurationKey<Boolean> NO_KOTLIN_NOTHING_VALUE_EXCEPTION =
             CompilerConfigurationKey.create("Do not use KotlinNothingValueException available since 1.4");
+
+    public static final CompilerConfigurationKey<Boolean> USE_OLD_SPILLED_VAR_TYPE_ANALYSIS =
+            CompilerConfigurationKey.create("Use old, SourceInterpreter-based analysis for fields, used for spilled variables in coroutines");
 }

compiler/config/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.kt

@@ -47,6 +47,9 @@ object CommonConfigurationKeys {
 
     @JvmField
     val EXPECT_ACTUAL_LINKER = CompilerConfigurationKey.create<Boolean>("Experimental expext/actual linker")
+
+    @JvmField
+    val DESERIALIZE_FAKE_OVERRIDES = CompilerConfigurationKey.create<Boolean>("Deserialize fake overrides")
 }
 
 var CompilerConfiguration.languageVersionSettings: LanguageVersionSettings

compiler/fir/analysis-tests/testData/builtIns/kotlin.txt

@@ -358,6 +358,20 @@ public abstract interface Comparable<in T> : R|kotlin/Any| {
 
 }
 
+@R|kotlin/annotation/Target|() @R|kotlin/annotation/MustBeDocumented|() @R|kotlin/SinceKotlin|(version = String(1.4)) public final annotation class DeprecatedSinceKotlin : R|kotlin/Annotation| {
+    public final val errorSince: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public final val hiddenSince: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public final val warningSince: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public constructor(warningSince: R|kotlin/String| = STUB, errorSince: R|kotlin/String| = STUB, hiddenSince: R|kotlin/String| = STUB): R|kotlin/DeprecatedSinceKotlin|
+
+}
+
 public final enum class DeprecationLevel : R|kotlin/Enum<kotlin/DeprecationLevel>| {
     private constructor(): R|kotlin/DeprecationLevel|
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/AnnotatedMethod.txt

@@ -1,5 +1,5 @@
 public open class AnnotatedMethod : R|kotlin/Any| {
-    public open fun f(): R|kotlin/Unit|
+    @R|kotlin/Deprecated|(message = String(Deprecated in Java)) public open fun f(): R|kotlin/Unit|
 
     public constructor(): R|test/AnnotatedMethod|
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt

@@ -15,7 +15,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
 
 }
 
-@R|test/Anno|(klass = <getClass>(<getClass>(R|kotlin/String|)), klasses = <implicitArrayOf>(<getClass>(R|kotlin/Int|), <getClass>(R|kotlin/String|), <getClass>(R|kotlin/Float|)), sarKlass = <getClass>(<getClass>(R|kotlin/String|)), d2arKlass = <getClass>(<getClass>(R|kotlin/DoubleArray|))) public final class Klass : R|kotlin/Any| {
+@R|test/Anno|(klass = <getClass>(<getClass>(R|kotlin/String|)), klasses = <implicitArrayOf>(<getClass>(<getClass>(R|kotlin/Int|)), <getClass>(<getClass>(R|kotlin/String|)), <getClass>(<getClass>(R|kotlin/Float|))), sarKlass = <getClass>(<getClass>(R|kotlin/String|)), d2arKlass = <getClass>(<getClass>(R|kotlin/DoubleArray|))) public final class Klass : R|kotlin/Any| {
     public constructor(): R|test/Klass|
 
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt

@@ -19,7 +19,7 @@ public final annotation class EnumAnno : R|kotlin/Annotation| {
 }
 
 public final class EnumArgumentWithCustomToString : R|kotlin/Any| {
-    public final fun annotated(): R|kotlin/Unit|
+    @R|test/EnumAnno|(value = R|test/E.CAKE|()) @R|test/EnumArrayAnno|(value = <implicitArrayOf>(R|test/E.CAKE|(), R|test/E.CAKE|())) public final fun annotated(): R|kotlin/Unit|
 
     public constructor(): R|test/EnumArgumentWithCustomToString|
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt

@@ -7,7 +7,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public abstract interface T : R|kotlin/Any| {
-    public abstract fun foo(): R|kotlin/Array<kotlin/Array<kotlin/Array<test/T>>>|
+    @R|test/Anno|(s = String(foo)) public abstract fun foo(): R|kotlin/Array<kotlin/Array<kotlin/Array<test/T>>>|
 
     public abstract val bar: R|kotlin/Array<kotlin/Array<kotlin/BooleanArray>>|
         public get(): R|kotlin/Array<kotlin/Array<kotlin/BooleanArray>>|

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt

@@ -7,6 +7,6 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Constructor : R|kotlin/Any| {
-    public constructor(): R|test/Constructor|
+    @R|test/Anno|(value = String(string)) public constructor(): R|test/Constructor|
 
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt

@@ -7,7 +7,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
-    public final fun foo(): R|kotlin/Unit|
+    @R|test/Anno|(t = R|java/lang/annotation/ElementType.METHOD|()) public final fun foo(): R|kotlin/Unit|
 
     public final var bar: R|kotlin/Int|
         public get(): R|kotlin/Int|

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/Function.txt

@@ -4,7 +4,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
-    public final fun foo(): R|kotlin/Unit|
+    @R|test/Anno|() public final fun foo(): R|kotlin/Unit|
 
     public constructor(): R|test/Class|
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt

@@ -7,7 +7,7 @@ public sealed class Sealed : R|kotlin/Any| {
     public final val z: R|test/Z|
         public get(): R|test/Z|
 
-    private constructor(z: R|test/Z|): R|test/Sealed|
+    @R|test/Ann|() private constructor(@R|test/Ann|() z: R|test/Z|): R|test/Sealed|
 
     public final class Derived : R|test/Sealed| {
         public constructor(z: R|test/Z|): R|test/Sealed.Derived|
@@ -20,11 +20,11 @@ public final class Test : R|kotlin/Any| {
     public final val z: R|test/Z|
         public get(): R|test/Z|
 
-    public constructor(z: R|test/Z|, a: R|kotlin/Int|): R|test/Test|
+    @R|test/Ann|() public constructor(z: R|test/Z|, @R|test/Ann|() a: R|kotlin/Int|): R|test/Test|
 
-    private constructor(z: R|test/Z|, s: R|kotlin/String|): R|test/Test|
+    @R|test/Ann|() private constructor(z: R|test/Z|, @R|test/Ann|() s: R|kotlin/String|): R|test/Test|
 
-    public constructor(z: R|test/Z|): R|test/Test|
+    @R|test/Ann|() public constructor(@R|test/Ann|() z: R|test/Z|): R|test/Test|
 
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt

@@ -8,6 +8,6 @@ public final inline class Z : R|kotlin/Any| {
     public final val value: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
-    internal constructor(value: R|kotlin/Int|): R|test/Z|
+    @R|kotlin/PublishedApi|() internal constructor(value: R|kotlin/Int|): R|test/Z|
 
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt

@@ -9,7 +9,7 @@ public final class A : R|kotlin/Any| {
 }
 
 @R|test/A.Anno|() public final class B : R|kotlin/Any| {
-    public final fun f(): R|kotlin/Unit|
+    @R|test/A.Anno|() public final fun f(): R|kotlin/Unit|
 
     public constructor(): R|test/B|
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt

@@ -1,4 +1,4 @@
-public final fun foo(): R|kotlin/Unit|
+@R|test/Anno|(t = R|java/lang/annotation/ElementType.METHOD|()) public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
     public final val t: R|java/lang/annotation/ElementType|

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt

@@ -1,6 +1,6 @@
-public final fun baz(): R|kotlin/Unit|
+@R|test/Anno|(t = <implicitArrayOf>()) public final fun baz(): R|kotlin/Unit|
 
-public final fun foo(): R|kotlin/Unit|
+@R|test/Anno|(t = <implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.FIELD|())) public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
     public final val t: R|kotlin/Array<out java/lang/annotation/ElementType>|

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/Function.txt

@@ -1,4 +1,4 @@
-public final fun function(): R|kotlin/Unit|
+@R|test/Anno|() public final fun function(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
     public constructor(): R|test/Anno|

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt

@@ -1,6 +1,6 @@
-public final fun baz(): R|kotlin/Unit|
+@R|test/Anno|(t = <implicitArrayOf>()) public final fun baz(): R|kotlin/Unit|
 
-public final fun foo(): R|kotlin/Unit|
+@R|test/Anno|(t = <implicitArrayOf>(String(live), String(long))) public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
     public final val t: R|kotlin/Array<out kotlin/String>|

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt

@@ -12,6 +12,6 @@ public final class Class : R|kotlin/Any| {
     public final val x: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
-    public constructor(x: R|kotlin/Int|, y: R|kotlin/String|): R|test/Class|
+    public constructor(@R|test/A|() x: R|kotlin/Int|, @R|test/B|() y: R|kotlin/String|): R|test/Class|
 
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunction.txt

@@ -1,4 +1,4 @@
-public final fun R|kotlin/Int|.foo(x: R|kotlin/Int|): R|kotlin/Unit|
+public final fun R|kotlin/Int|.foo(@R|test/A|() x: R|kotlin/Int|): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
     public constructor(): R|test/A|

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt

@@ -4,7 +4,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
-    public final fun R|kotlin/String|.foo(x: R|kotlin/Int|): R|kotlin/Int|
+    public final fun R|kotlin/String|.foo(@R|test/Anno|() x: R|kotlin/Int|): R|kotlin/Int|
 
     public constructor(): R|test/Class|
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt

@@ -6,7 +6,7 @@ public final annotation class A : R|kotlin/Annotation| {
 public final class Class : R|kotlin/Any| {
     public final var R|kotlin/Int|.foo: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): R|kotlin/Unit|
+        public set(@R|test/A|() value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/Class|
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/FunctionInClass.txt

@@ -4,7 +4,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
-    public final fun foo(x: R|kotlin/String|): R|kotlin/Unit|
+    public final fun foo(@R|test/Anno|() x: R|kotlin/String|): R|kotlin/Unit|
 
     public constructor(): R|test/Class|
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/FunctionInTrait.txt

@@ -4,6 +4,6 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public abstract interface Trait : R|kotlin/Any| {
-    public open fun foo(x: R|kotlin/String|): R|kotlin/Int|
+    public open fun foo(@R|test/Anno|() x: R|kotlin/String|): R|kotlin/Int|
 
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/ManyAnnotations.txt

@@ -1,6 +1,6 @@
-public final fun bar(x: R|kotlin/Int|): R|kotlin/Unit|
+public final fun bar(@R|test/A|() @R|test/B|() @R|test/C|() @R|test/D|() x: R|kotlin/Int|): R|kotlin/Unit|
 
-public final fun foo(x: R|kotlin/Int|, y: R|kotlin/Double|, z: R|kotlin/String|): R|kotlin/Unit|
+public final fun foo(@R|test/A|() @R|test/B|() x: R|kotlin/Int|, @R|test/A|() @R|test/C|() y: R|kotlin/Double|, @R|test/B|() @R|test/C|() @R|test/D|() z: R|kotlin/String|): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
     public constructor(): R|test/A|

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt

@@ -6,7 +6,7 @@ public final annotation class A : R|kotlin/Annotation| {
 public final class Class : R|kotlin/Any| {
     public final var foo: R|kotlin/Int|
         public get(): R|kotlin/Int|
-        public set(value: R|kotlin/Int|): R|kotlin/Unit|
+        public set(@R|test/A|() value: R|kotlin/Int|): R|kotlin/Unit|
 
     public constructor(): R|test/Class|
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/TopLevelFunction.txt

@@ -1,4 +1,4 @@
-public final fun foo(x: R|kotlin/Int|): R|kotlin/Unit|
+public final fun foo(@R|test/Anno|() x: R|kotlin/Int|): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
     public constructor(): R|test/Anno|

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt

@@ -1,5 +1,5 @@
 public final class A : R|kotlin/Any| {
-    public final fun R|kotlin/String|.myLength(q: R|kotlin/String|): R|kotlin/Int|
+    public final fun R|kotlin/String|.myLength(@R|test/Ann|() q: R|kotlin/String|): R|kotlin/Int|
 
     public final val R|kotlin/String|.myLength2: R|kotlin/Int|
         public get(): R|kotlin/Int|

compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt

@@ -4,7 +4,7 @@ public final class Test : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
         public final fun incProp4(): R|kotlin/Unit|
 
-        public final const val constProp8: R|kotlin/Int|
+        public final const val constProp8: R|kotlin/Int| = Int(80)
             public get(): R|kotlin/Int|
 
         public final val prop1: R|kotlin/Int|

compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt

@@ -2,7 +2,7 @@ public abstract interface Test : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
         public final fun incProp4(): R|kotlin/Unit|
 
-        public final const val constProp8: R|kotlin/Int|
+        public final const val constProp8: R|kotlin/Int| = Int(80)
             public get(): R|kotlin/Int|
 
         public final val prop1: R|kotlin/Int|

compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/Const.txt

@@ -1,5 +1,5 @@
 public final object A : R|kotlin/Any| {
-    internal final const val inObject: R|kotlin/Int|
+    internal final const val inObject: R|kotlin/Int| = Int(2)
         internal get(): R|kotlin/Int|
 
     private constructor(): R|test/A|
@@ -10,7 +10,7 @@ public final class B : R|kotlin/Any| {
     public constructor(): R|test/B|
 
     public final companion object Companion : R|kotlin/Any| {
-        public final const val inCompanion: R|kotlin/Int|
+        public final const val inCompanion: R|kotlin/Int| = Int(3)
             public get(): R|kotlin/Int|
 
         private constructor(): R|test/B.Companion|

compiler/fir/analysis-tests/testData/resolve/cfg/annotatedLocalClass.dot

@@ -5,94 +5,100 @@ digraph annotatedLocalClass_kt {
 
     subgraph cluster_0 {
         color=red
-        0 [label="Enter function <init>" style="filled" fillcolor=red];
-        2 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        1 [label="Exit function <init>" style="filled" fillcolor=red];
+        0 [label="Enter class Ann" style="filled" fillcolor=red];
+        1 [label="Exit class Ann" style="filled" fillcolor=red];
     }
-    0 -> {2};
-    2 -> {1};
+    0 -> {1} [color=green];
 
     subgraph cluster_1 {
         color=red
-        3 [label="Enter class Ann" style="filled" fillcolor=red];
-        4 [label="Exit class Ann" style="filled" fillcolor=red];
+        2 [label="Enter function <init>" style="filled" fillcolor=red];
+        3 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        4 [label="Exit function <init>" style="filled" fillcolor=red];
     }
-    3 -> {4} [color=green];
+    2 -> {3};
+    3 -> {4};
 
     subgraph cluster_2 {
         color=red
         5 [label="Enter function foo" style="filled" fillcolor=red];
         subgraph cluster_3 {
             color=blue
-            7 [label="Enter when"];
-            subgraph cluster_4 {
-                color=blue
-                9 [label="Enter when branch condition "];
-                10 [label="Access variable R|<local>/b|"];
-                11 [label="Exit when branch condition"];
-            }
-            18 [label="Synthetic else branch"];
-            12 [label="Enter when branch result"];
+            23 [label="Enter class Local" style="filled" fillcolor=red];
+            24 [label="Exit class Local" style="filled" fillcolor=red];
+        }
+        subgraph cluster_4 {
+            color=blue
+            6 [label="Enter block"];
             subgraph cluster_5 {
                 color=blue
-                13 [label="Enter block"];
-                14 [label="Jump: ^foo Unit"];
-                15 [label="Stub" style="filled" fillcolor=gray];
-                16 [label="Exit block" style="filled" fillcolor=gray];
+                7 [label="Enter when"];
+                subgraph cluster_6 {
+                    color=blue
+                    8 [label="Enter when branch condition "];
+                    9 [label="Access variable R|<local>/b|"];
+                    10 [label="Exit when branch condition"];
+                }
+                11 [label="Synthetic else branch"];
+                12 [label="Enter when branch result"];
+                subgraph cluster_7 {
+                    color=blue
+                    13 [label="Enter block"];
+                    14 [label="Jump: ^foo Unit"];
+                    15 [label="Stub" style="filled" fillcolor=gray];
+                    16 [label="Exit block" style="filled" fillcolor=gray];
+                }
+                17 [label="Exit when branch result" style="filled" fillcolor=gray];
+                18 [label="Exit when"];
             }
-            17 [label="Exit when branch result" style="filled" fillcolor=gray];
-            8 [label="Exit when"];
+            19 [label="Exit local class foo"];
+            20 [label="Function call: R|/bar|()"];
+            21 [label="Exit block"];
         }
-        subgraph cluster_6 {
-            color=blue
-            19 [label="Enter annotation"];
-            20 [label="Exit annotation"];
-        }
-        21 [label="Exit local class foo"];
-        22 [label="Function call: R|/bar|()"];
-        6 [label="Exit function foo" style="filled" fillcolor=red];
+        22 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    5 -> {7};
-    7 -> {9};
-    8 -> {19};
+    5 -> {6};
+    6 -> {7};
+    7 -> {8};
+    8 -> {9};
     9 -> {10};
-    10 -> {11};
-    11 -> {12 18};
+    10 -> {12 11};
+    11 -> {18};
     12 -> {13};
     13 -> {14};
-    14 -> {6};
+    14 -> {22};
     14 -> {15} [style=dotted];
     15 -> {16} [style=dotted];
     16 -> {17} [style=dotted];
-    17 -> {8} [style=dotted];
-    18 -> {8};
+    17 -> {18} [style=dotted];
+    18 -> {19};
+    18 -> {25} [color=red];
     19 -> {20};
     20 -> {21};
-    20 -> {23} [color=red];
     21 -> {22};
-    22 -> {6};
-
-    subgraph cluster_7 {
-        color=red
-        23 [label="Enter function <init>" style="filled" fillcolor=red];
-        25 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        24 [label="Exit function <init>" style="filled" fillcolor=red];
-    }
-    23 -> {25};
-    25 -> {24};
+    23 -> {24} [color=green];
 
     subgraph cluster_8 {
         color=red
-        26 [label="Enter class Local" style="filled" fillcolor=red];
-        27 [label="Exit class Local" style="filled" fillcolor=red];
+        25 [label="Enter function <init>" style="filled" fillcolor=red];
+        26 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        27 [label="Exit function <init>" style="filled" fillcolor=red];
     }
-    26 -> {27} [color=green];
+    25 -> {26};
+    26 -> {27};
 
     subgraph cluster_9 {
         color=red
         28 [label="Enter function bar" style="filled" fillcolor=red];
-        29 [label="Exit function bar" style="filled" fillcolor=red];
+        subgraph cluster_10 {
+            color=blue
+            29 [label="Enter block"];
+            30 [label="Exit block"];
+        }
+        31 [label="Exit function bar" style="filled" fillcolor=red];
     }
     28 -> {29};
+    29 -> {30};
+    30 -> {31};
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/binaryOperations.dot

@@ -8,229 +8,257 @@ digraph binaryOperations_kt {
         0 [label="Enter function test_1" style="filled" fillcolor=red];
         subgraph cluster_1 {
             color=blue
-            2 [label="Enter when"];
+            1 [label="Enter block"];
             subgraph cluster_2 {
                 color=blue
-                4 [label="Enter when branch condition "];
+                2 [label="Enter when"];
                 subgraph cluster_3 {
                     color=blue
-                    6 [label="Enter ||"];
-                    7 [label="Access variable R|<local>/b1|"];
-                    8 [label="Exit left part of ||"];
-                    9 [label="Enter right part of ||"];
-                    10 [label="Access variable R|<local>/b2|"];
-                    5 [label="Exit ||"];
+                    3 [label="Enter when branch condition "];
+                    subgraph cluster_4 {
+                        color=blue
+                        4 [label="Enter ||"];
+                        5 [label="Access variable R|<local>/b1|"];
+                        6 [label="Exit left part of ||"];
+                        7 [label="Enter right part of ||"];
+                        8 [label="Access variable R|<local>/b2|"];
+                        9 [label="Exit ||"];
+                    }
+                    10 [label="Exit when branch condition"];
                 }
-                11 [label="Exit when branch condition"];
+                11 [label="Synthetic else branch"];
+                12 [label="Enter when branch result"];
+                subgraph cluster_5 {
+                    color=blue
+                    13 [label="Enter block"];
+                    14 [label="Const: Int(1)"];
+                    15 [label="Exit block"];
+                }
+                16 [label="Exit when branch result"];
+                17 [label="Exit when"];
             }
-            17 [label="Synthetic else branch"];
-            12 [label="Enter when branch result"];
-            subgraph cluster_4 {
-                color=blue
-                13 [label="Enter block"];
-                14 [label="Const: Int(1)"];
-                15 [label="Exit block"];
-            }
-            16 [label="Exit when branch result"];
-            3 [label="Exit when"];
+            18 [label="Exit block"];
         }
-        1 [label="Exit function test_1" style="filled" fillcolor=red];
+        19 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    0 -> {2};
-    2 -> {4};
-    3 -> {1};
-    4 -> {6};
-    5 -> {11};
-    6 -> {7};
+    0 -> {1};
+    1 -> {2};
+    2 -> {3};
+    3 -> {4};
+    4 -> {5};
+    5 -> {6};
+    6 -> {9 7};
     7 -> {8};
-    8 -> {5 9};
+    8 -> {9};
     9 -> {10};
-    10 -> {5};
-    11 -> {12 17};
+    10 -> {12 11};
+    11 -> {17};
     12 -> {13};
     13 -> {14};
     14 -> {15};
     15 -> {16};
-    16 -> {3};
-    17 -> {3};
+    16 -> {17};
+    17 -> {18};
+    18 -> {19};
 
-    subgraph cluster_5 {
+    subgraph cluster_6 {
         color=red
-        18 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_6 {
+        20 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_7 {
             color=blue
-            20 [label="Enter when"];
-            subgraph cluster_7 {
+            21 [label="Enter block"];
+            subgraph cluster_8 {
                 color=blue
-                22 [label="Enter when branch condition "];
-                subgraph cluster_8 {
+                22 [label="Enter when"];
+                subgraph cluster_9 {
                     color=blue
-                    24 [label="Enter &&"];
-                    25 [label="Access variable R|<local>/b1|"];
-                    26 [label="Exit left part of &&"];
-                    27 [label="Enter right part of &&"];
-                    28 [label="Access variable R|<local>/b2|"];
-                    23 [label="Exit &&"];
+                    23 [label="Enter when branch condition "];
+                    subgraph cluster_10 {
+                        color=blue
+                        24 [label="Enter &&"];
+                        25 [label="Access variable R|<local>/b1|"];
+                        26 [label="Exit left part of &&"];
+                        27 [label="Enter right part of &&"];
+                        28 [label="Access variable R|<local>/b2|"];
+                        29 [label="Exit &&"];
+                    }
+                    30 [label="Exit when branch condition"];
                 }
-                29 [label="Exit when branch condition"];
+                31 [label="Synthetic else branch"];
+                32 [label="Enter when branch result"];
+                subgraph cluster_11 {
+                    color=blue
+                    33 [label="Enter block"];
+                    34 [label="Const: Int(1)"];
+                    35 [label="Exit block"];
+                }
+                36 [label="Exit when branch result"];
+                37 [label="Exit when"];
             }
-            35 [label="Synthetic else branch"];
-            30 [label="Enter when branch result"];
-            subgraph cluster_9 {
-                color=blue
-                31 [label="Enter block"];
-                32 [label="Const: Int(1)"];
-                33 [label="Exit block"];
-            }
-            34 [label="Exit when branch result"];
-            21 [label="Exit when"];
+            38 [label="Exit block"];
         }
-        19 [label="Exit function test_2" style="filled" fillcolor=red];
+        39 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    18 -> {20};
-    20 -> {22};
-    21 -> {19};
-    22 -> {24};
-    23 -> {29};
+    20 -> {21};
+    21 -> {22};
+    22 -> {23};
+    23 -> {24};
     24 -> {25};
     25 -> {26};
-    26 -> {23 27};
+    26 -> {29 27};
     27 -> {28};
-    28 -> {23};
-    29 -> {30 35};
-    30 -> {31};
-    31 -> {32};
+    28 -> {29};
+    29 -> {30};
+    30 -> {32 31};
+    31 -> {37};
     32 -> {33};
     33 -> {34};
-    34 -> {21};
-    35 -> {21};
+    34 -> {35};
+    35 -> {36};
+    36 -> {37};
+    37 -> {38};
+    38 -> {39};
 
-    subgraph cluster_10 {
+    subgraph cluster_12 {
         color=red
-        36 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_11 {
+        40 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_13 {
             color=blue
-            38 [label="Enter when"];
-            subgraph cluster_12 {
+            41 [label="Enter block"];
+            subgraph cluster_14 {
                 color=blue
-                40 [label="Enter when branch condition "];
-                subgraph cluster_13 {
+                42 [label="Enter when"];
+                subgraph cluster_15 {
                     color=blue
-                    42 [label="Enter ||"];
-                    subgraph cluster_14 {
+                    43 [label="Enter when branch condition "];
+                    subgraph cluster_16 {
                         color=blue
-                        44 [label="Enter &&"];
-                        45 [label="Access variable R|<local>/b1|"];
-                        46 [label="Exit left part of &&"];
-                        47 [label="Enter right part of &&"];
-                        48 [label="Access variable R|<local>/b2|"];
-                        43 [label="Exit &&"];
+                        44 [label="Enter ||"];
+                        subgraph cluster_17 {
+                            color=blue
+                            45 [label="Enter &&"];
+                            46 [label="Access variable R|<local>/b1|"];
+                            47 [label="Exit left part of &&"];
+                            48 [label="Enter right part of &&"];
+                            49 [label="Access variable R|<local>/b2|"];
+                            50 [label="Exit &&"];
+                        }
+                        51 [label="Exit left part of ||"];
+                        52 [label="Enter right part of ||"];
+                        53 [label="Access variable R|<local>/b3|"];
+                        54 [label="Exit ||"];
                     }
-                    49 [label="Exit left part of ||"];
-                    50 [label="Enter right part of ||"];
-                    51 [label="Access variable R|<local>/b3|"];
-                    41 [label="Exit ||"];
+                    55 [label="Exit when branch condition"];
                 }
-                52 [label="Exit when branch condition"];
+                56 [label="Synthetic else branch"];
+                57 [label="Enter when branch result"];
+                subgraph cluster_18 {
+                    color=blue
+                    58 [label="Enter block"];
+                    59 [label="Const: Int(1)"];
+                    60 [label="Exit block"];
+                }
+                61 [label="Exit when branch result"];
+                62 [label="Exit when"];
             }
-            58 [label="Synthetic else branch"];
-            53 [label="Enter when branch result"];
-            subgraph cluster_15 {
-                color=blue
-                54 [label="Enter block"];
-                55 [label="Const: Int(1)"];
-                56 [label="Exit block"];
-            }
-            57 [label="Exit when branch result"];
-            39 [label="Exit when"];
+            63 [label="Exit block"];
         }
-        37 [label="Exit function test_3" style="filled" fillcolor=red];
+        64 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    36 -> {38};
-    38 -> {40};
-    39 -> {37};
-    40 -> {42};
-    41 -> {52};
-    42 -> {44};
-    43 -> {49};
+    40 -> {41};
+    41 -> {42};
+    42 -> {43};
+    43 -> {44};
     44 -> {45};
     45 -> {46};
-    46 -> {43 47};
-    47 -> {48};
-    48 -> {43};
-    49 -> {41 50};
+    46 -> {47};
+    47 -> {50 48};
+    48 -> {49};
+    49 -> {50};
     50 -> {51};
-    51 -> {41};
-    52 -> {53 58};
+    51 -> {54 52};
+    52 -> {53};
     53 -> {54};
     54 -> {55};
-    55 -> {56};
-    56 -> {57};
-    57 -> {39};
-    58 -> {39};
+    55 -> {57 56};
+    56 -> {62};
+    57 -> {58};
+    58 -> {59};
+    59 -> {60};
+    60 -> {61};
+    61 -> {62};
+    62 -> {63};
+    63 -> {64};
 
-    subgraph cluster_16 {
+    subgraph cluster_19 {
         color=red
-        59 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_17 {
+        65 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_20 {
             color=blue
-            61 [label="Enter when"];
-            subgraph cluster_18 {
-                color=blue
-                63 [label="Enter when branch condition "];
-                subgraph cluster_19 {
-                    color=blue
-                    65 [label="Enter ||"];
-                    66 [label="Access variable R|<local>/b1|"];
-                    67 [label="Exit left part of ||"];
-                    68 [label="Enter right part of ||"];
-                    subgraph cluster_20 {
-                        color=blue
-                        70 [label="Enter &&"];
-                        71 [label="Access variable R|<local>/b2|"];
-                        72 [label="Exit left part of &&"];
-                        73 [label="Enter right part of &&"];
-                        74 [label="Access variable R|<local>/b3|"];
-                        69 [label="Exit &&"];
-                    }
-                    64 [label="Exit ||"];
-                }
-                75 [label="Exit when branch condition"];
-            }
-            81 [label="Synthetic else branch"];
-            76 [label="Enter when branch result"];
+            66 [label="Enter block"];
             subgraph cluster_21 {
                 color=blue
-                77 [label="Enter block"];
-                78 [label="Const: Int(1)"];
-                79 [label="Exit block"];
+                67 [label="Enter when"];
+                subgraph cluster_22 {
+                    color=blue
+                    68 [label="Enter when branch condition "];
+                    subgraph cluster_23 {
+                        color=blue
+                        69 [label="Enter ||"];
+                        70 [label="Access variable R|<local>/b1|"];
+                        71 [label="Exit left part of ||"];
+                        72 [label="Enter right part of ||"];
+                        subgraph cluster_24 {
+                            color=blue
+                            73 [label="Enter &&"];
+                            74 [label="Access variable R|<local>/b2|"];
+                            75 [label="Exit left part of &&"];
+                            76 [label="Enter right part of &&"];
+                            77 [label="Access variable R|<local>/b3|"];
+                            78 [label="Exit &&"];
+                        }
+                        79 [label="Exit ||"];
+                    }
+                    80 [label="Exit when branch condition"];
+                }
+                81 [label="Synthetic else branch"];
+                82 [label="Enter when branch result"];
+                subgraph cluster_25 {
+                    color=blue
+                    83 [label="Enter block"];
+                    84 [label="Const: Int(1)"];
+                    85 [label="Exit block"];
+                }
+                86 [label="Exit when branch result"];
+                87 [label="Exit when"];
             }
-            80 [label="Exit when branch result"];
-            62 [label="Exit when"];
+            88 [label="Exit block"];
         }
-        60 [label="Exit function test_4" style="filled" fillcolor=red];
+        89 [label="Exit function test_4" style="filled" fillcolor=red];
     }
-    59 -> {61};
-    61 -> {63};
-    62 -> {60};
-    63 -> {65};
-    64 -> {75};
     65 -> {66};
     66 -> {67};
-    67 -> {64 68};
-    68 -> {70};
-    69 -> {64};
+    67 -> {68};
+    68 -> {69};
+    69 -> {70};
     70 -> {71};
-    71 -> {72};
-    72 -> {69 73};
+    71 -> {79 72};
+    72 -> {73};
     73 -> {74};
-    74 -> {69};
-    75 -> {76 81};
+    74 -> {75};
+    75 -> {78 76};
     76 -> {77};
     77 -> {78};
     78 -> {79};
     79 -> {80};
-    80 -> {62};
-    81 -> {62};
+    80 -> {82 81};
+    81 -> {87};
+    82 -> {83};
+    83 -> {84};
+    84 -> {85};
+    85 -> {86};
+    86 -> {87};
+    87 -> {88};
+    88 -> {89};
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/booleanOperatorsWithConsts.dot

@@ -8,411 +8,467 @@ digraph booleanOperatorsWithConsts_kt {
         0 [label="Enter function test_1" style="filled" fillcolor=red];
         subgraph cluster_1 {
             color=blue
-            2 [label="Enter when"];
+            1 [label="Enter block"];
             subgraph cluster_2 {
                 color=blue
-                4 [label="Enter when branch condition "];
+                2 [label="Enter when"];
                 subgraph cluster_3 {
                     color=blue
-                    6 [label="Enter ||"];
-                    7 [label="Access variable R|<local>/b|"];
-                    8 [label="Exit left part of ||"];
-                    9 [label="Enter right part of ||"];
-                    10 [label="Const: Boolean(false)"];
-                    5 [label="Exit ||"];
+                    3 [label="Enter when branch condition "];
+                    subgraph cluster_4 {
+                        color=blue
+                        4 [label="Enter ||"];
+                        5 [label="Access variable R|<local>/b|"];
+                        6 [label="Exit left part of ||"];
+                        7 [label="Enter right part of ||"];
+                        8 [label="Const: Boolean(false)"];
+                        9 [label="Exit ||"];
+                    }
+                    10 [label="Exit when branch condition"];
                 }
-                11 [label="Exit when branch condition"];
+                11 [label="Synthetic else branch"];
+                12 [label="Enter when branch result"];
+                subgraph cluster_5 {
+                    color=blue
+                    13 [label="Enter block"];
+                    14 [label="Const: Int(1)"];
+                    15 [label="Exit block"];
+                }
+                16 [label="Exit when branch result"];
+                17 [label="Exit when"];
             }
-            17 [label="Synthetic else branch"];
-            12 [label="Enter when branch result"];
-            subgraph cluster_4 {
-                color=blue
-                13 [label="Enter block"];
-                14 [label="Const: Int(1)"];
-                15 [label="Exit block"];
-            }
-            16 [label="Exit when branch result"];
-            3 [label="Exit when"];
+            18 [label="Exit block"];
         }
-        1 [label="Exit function test_1" style="filled" fillcolor=red];
+        19 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    0 -> {2};
-    2 -> {4};
-    3 -> {1};
-    4 -> {6};
-    5 -> {11};
-    6 -> {7};
+    0 -> {1};
+    1 -> {2};
+    2 -> {3};
+    3 -> {4};
+    4 -> {5};
+    5 -> {6};
+    6 -> {9 7};
     7 -> {8};
-    8 -> {5 9};
+    8 -> {9};
     9 -> {10};
-    10 -> {5};
-    11 -> {12 17};
+    10 -> {12 11};
+    11 -> {17};
     12 -> {13};
     13 -> {14};
     14 -> {15};
     15 -> {16};
-    16 -> {3};
-    17 -> {3};
+    16 -> {17};
+    17 -> {18};
+    18 -> {19};
 
-    subgraph cluster_5 {
+    subgraph cluster_6 {
         color=red
-        18 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_6 {
+        20 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_7 {
             color=blue
-            20 [label="Enter when"];
-            subgraph cluster_7 {
+            21 [label="Enter block"];
+            subgraph cluster_8 {
                 color=blue
-                22 [label="Enter when branch condition "];
-                subgraph cluster_8 {
+                22 [label="Enter when"];
+                subgraph cluster_9 {
                     color=blue
-                    24 [label="Enter ||"];
-                    25 [label="Const: Boolean(false)"];
-                    26 [label="Exit left part of ||"];
-                    27 [label="Enter right part of ||"];
-                    28 [label="Access variable R|<local>/b|"];
-                    23 [label="Exit ||"];
+                    23 [label="Enter when branch condition "];
+                    subgraph cluster_10 {
+                        color=blue
+                        24 [label="Enter ||"];
+                        25 [label="Const: Boolean(false)"];
+                        26 [label="Exit left part of ||"];
+                        27 [label="Enter right part of ||"];
+                        28 [label="Access variable R|<local>/b|"];
+                        29 [label="Exit ||"];
+                    }
+                    30 [label="Exit when branch condition"];
                 }
-                29 [label="Exit when branch condition"];
+                31 [label="Synthetic else branch"];
+                32 [label="Enter when branch result"];
+                subgraph cluster_11 {
+                    color=blue
+                    33 [label="Enter block"];
+                    34 [label="Const: Int(1)"];
+                    35 [label="Exit block"];
+                }
+                36 [label="Exit when branch result"];
+                37 [label="Exit when"];
             }
-            35 [label="Synthetic else branch"];
-            30 [label="Enter when branch result"];
-            subgraph cluster_9 {
-                color=blue
-                31 [label="Enter block"];
-                32 [label="Const: Int(1)"];
-                33 [label="Exit block"];
-            }
-            34 [label="Exit when branch result"];
-            21 [label="Exit when"];
+            38 [label="Exit block"];
         }
-        19 [label="Exit function test_2" style="filled" fillcolor=red];
+        39 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    18 -> {20};
-    20 -> {22};
-    21 -> {19};
-    22 -> {24};
-    23 -> {29};
+    20 -> {21};
+    21 -> {22};
+    22 -> {23};
+    23 -> {24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
-    26 -> {23} [style=dotted];
+    26 -> {29} [style=dotted];
     27 -> {28};
-    28 -> {23};
-    29 -> {30 35};
-    30 -> {31};
-    31 -> {32};
+    28 -> {29};
+    29 -> {30};
+    30 -> {32 31};
+    31 -> {37};
     32 -> {33};
     33 -> {34};
-    34 -> {21};
-    35 -> {21};
+    34 -> {35};
+    35 -> {36};
+    36 -> {37};
+    37 -> {38};
+    38 -> {39};
 
-    subgraph cluster_10 {
+    subgraph cluster_12 {
         color=red
-        36 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_11 {
+        40 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_13 {
             color=blue
-            38 [label="Enter when"];
-            subgraph cluster_12 {
-                color=blue
-                40 [label="Enter when branch condition "];
-                subgraph cluster_13 {
-                    color=blue
-                    42 [label="Enter ||"];
-                    43 [label="Access variable R|<local>/b|"];
-                    44 [label="Exit left part of ||"];
-                    45 [label="Enter right part of ||"];
-                    46 [label="Const: Boolean(true)"];
-                    41 [label="Exit ||"];
-                }
-                47 [label="Exit when branch condition"];
-            }
-            53 [label="Synthetic else branch"];
-            48 [label="Enter when branch result"];
+            41 [label="Enter block"];
             subgraph cluster_14 {
                 color=blue
-                49 [label="Enter block"];
-                50 [label="Const: Int(1)"];
-                51 [label="Exit block"];
+                42 [label="Enter when"];
+                subgraph cluster_15 {
+                    color=blue
+                    43 [label="Enter when branch condition "];
+                    subgraph cluster_16 {
+                        color=blue
+                        44 [label="Enter ||"];
+                        45 [label="Access variable R|<local>/b|"];
+                        46 [label="Exit left part of ||"];
+                        47 [label="Enter right part of ||"];
+                        48 [label="Const: Boolean(true)"];
+                        49 [label="Exit ||"];
+                    }
+                    50 [label="Exit when branch condition"];
+                }
+                51 [label="Synthetic else branch"];
+                52 [label="Enter when branch result"];
+                subgraph cluster_17 {
+                    color=blue
+                    53 [label="Enter block"];
+                    54 [label="Const: Int(1)"];
+                    55 [label="Exit block"];
+                }
+                56 [label="Exit when branch result"];
+                57 [label="Exit when"];
             }
-            52 [label="Exit when branch result"];
-            39 [label="Exit when"];
+            58 [label="Exit block"];
         }
-        37 [label="Exit function test_3" style="filled" fillcolor=red];
+        59 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    36 -> {38};
-    38 -> {40};
-    39 -> {37};
-    40 -> {42};
-    41 -> {47};
+    40 -> {41};
+    41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {41 45};
+    44 -> {45};
     45 -> {46};
-    46 -> {41};
-    47 -> {48 53};
+    46 -> {49 47};
+    47 -> {48};
     48 -> {49};
     49 -> {50};
-    50 -> {51};
-    51 -> {52};
-    52 -> {39};
-    53 -> {39};
+    50 -> {52 51};
+    51 -> {57};
+    52 -> {53};
+    53 -> {54};
+    54 -> {55};
+    55 -> {56};
+    56 -> {57};
+    57 -> {58};
+    58 -> {59};
 
-    subgraph cluster_15 {
+    subgraph cluster_18 {
         color=red
-        54 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_16 {
+        60 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_19 {
             color=blue
-            56 [label="Enter when"];
-            subgraph cluster_17 {
+            61 [label="Enter block"];
+            subgraph cluster_20 {
                 color=blue
-                58 [label="Enter when branch condition "];
-                subgraph cluster_18 {
+                62 [label="Enter when"];
+                subgraph cluster_21 {
                     color=blue
-                    60 [label="Enter ||"];
-                    61 [label="Const: Boolean(true)"];
-                    62 [label="Exit left part of ||"];
-                    63 [label="Enter right part of ||" style="filled" fillcolor=gray];
-                    64 [label="Access variable R|<local>/b|" style="filled" fillcolor=gray];
-                    59 [label="Exit ||"];
+                    63 [label="Enter when branch condition "];
+                    subgraph cluster_22 {
+                        color=blue
+                        64 [label="Enter ||"];
+                        65 [label="Const: Boolean(true)"];
+                        66 [label="Exit left part of ||"];
+                        67 [label="Enter right part of ||" style="filled" fillcolor=gray];
+                        68 [label="Access variable R|<local>/b|" style="filled" fillcolor=gray];
+                        69 [label="Exit ||"];
+                    }
+                    70 [label="Exit when branch condition"];
                 }
-                65 [label="Exit when branch condition"];
-            }
-            71 [label="Synthetic else branch"];
-            66 [label="Enter when branch result"];
-            subgraph cluster_19 {
-                color=blue
-                67 [label="Enter block"];
-                68 [label="Const: Int(1)"];
-                69 [label="Exit block"];
-            }
-            70 [label="Exit when branch result"];
-            57 [label="Exit when"];
-        }
-        55 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
-    54 -> {56};
-    56 -> {58};
-    57 -> {55};
-    58 -> {60};
-    59 -> {65};
-    60 -> {61};
-    61 -> {62};
-    62 -> {59};
-    62 -> {63} [style=dotted];
-    63 -> {64} [style=dotted];
-    64 -> {59} [style=dotted];
-    65 -> {66 71};
-    66 -> {67};
-    67 -> {68};
-    68 -> {69};
-    69 -> {70};
-    70 -> {57};
-    71 -> {57};
-
-    subgraph cluster_20 {
-        color=red
-        72 [label="Enter function test_5" style="filled" fillcolor=red];
-        subgraph cluster_21 {
-            color=blue
-            74 [label="Enter when"];
-            subgraph cluster_22 {
-                color=blue
-                76 [label="Enter when branch condition "];
+                71 [label="Synthetic else branch"];
+                72 [label="Enter when branch result"];
                 subgraph cluster_23 {
                     color=blue
-                    78 [label="Enter &&"];
-                    79 [label="Access variable R|<local>/b|"];
-                    80 [label="Exit left part of &&"];
-                    81 [label="Enter right part of &&"];
-                    82 [label="Const: Boolean(false)"];
-                    77 [label="Exit &&"];
+                    73 [label="Enter block"];
+                    74 [label="Const: Int(1)"];
+                    75 [label="Exit block"];
                 }
-                83 [label="Exit when branch condition"];
+                76 [label="Exit when branch result"];
+                77 [label="Exit when"];
             }
-            89 [label="Synthetic else branch"];
-            84 [label="Enter when branch result"];
-            subgraph cluster_24 {
-                color=blue
-                85 [label="Enter block"];
-                86 [label="Const: Int(1)"];
-                87 [label="Exit block"];
-            }
-            88 [label="Exit when branch result"];
-            75 [label="Exit when"];
+            78 [label="Exit block"];
         }
-        73 [label="Exit function test_5" style="filled" fillcolor=red];
+        79 [label="Exit function test_4" style="filled" fillcolor=red];
     }
-    72 -> {74};
-    74 -> {76};
-    75 -> {73};
-    76 -> {78};
-    77 -> {83};
+    60 -> {61};
+    61 -> {62};
+    62 -> {63};
+    63 -> {64};
+    64 -> {65};
+    65 -> {66};
+    66 -> {69};
+    66 -> {67} [style=dotted];
+    67 -> {68} [style=dotted];
+    68 -> {69} [style=dotted];
+    69 -> {70};
+    70 -> {72 71};
+    71 -> {77};
+    72 -> {73};
+    73 -> {74};
+    74 -> {75};
+    75 -> {76};
+    76 -> {77};
+    77 -> {78};
     78 -> {79};
-    79 -> {80};
-    80 -> {77 81};
+
+    subgraph cluster_24 {
+        color=red
+        80 [label="Enter function test_5" style="filled" fillcolor=red];
+        subgraph cluster_25 {
+            color=blue
+            81 [label="Enter block"];
+            subgraph cluster_26 {
+                color=blue
+                82 [label="Enter when"];
+                subgraph cluster_27 {
+                    color=blue
+                    83 [label="Enter when branch condition "];
+                    subgraph cluster_28 {
+                        color=blue
+                        84 [label="Enter &&"];
+                        85 [label="Access variable R|<local>/b|"];
+                        86 [label="Exit left part of &&"];
+                        87 [label="Enter right part of &&"];
+                        88 [label="Const: Boolean(false)"];
+                        89 [label="Exit &&"];
+                    }
+                    90 [label="Exit when branch condition"];
+                }
+                91 [label="Synthetic else branch"];
+                92 [label="Enter when branch result"];
+                subgraph cluster_29 {
+                    color=blue
+                    93 [label="Enter block"];
+                    94 [label="Const: Int(1)"];
+                    95 [label="Exit block"];
+                }
+                96 [label="Exit when branch result"];
+                97 [label="Exit when"];
+            }
+            98 [label="Exit block"];
+        }
+        99 [label="Exit function test_5" style="filled" fillcolor=red];
+    }
+    80 -> {81};
     81 -> {82};
-    82 -> {77};
-    83 -> {84 89};
+    82 -> {83};
+    83 -> {84};
     84 -> {85};
     85 -> {86};
-    86 -> {87};
+    86 -> {89 87};
     87 -> {88};
-    88 -> {75};
-    89 -> {75};
-
-    subgraph cluster_25 {
-        color=red
-        90 [label="Enter function test_6" style="filled" fillcolor=red];
-        subgraph cluster_26 {
-            color=blue
-            92 [label="Enter when"];
-            subgraph cluster_27 {
-                color=blue
-                94 [label="Enter when branch condition "];
-                subgraph cluster_28 {
-                    color=blue
-                    96 [label="Enter &&"];
-                    97 [label="Const: Boolean(false)"];
-                    98 [label="Exit left part of &&"];
-                    99 [label="Enter right part of &&" style="filled" fillcolor=gray];
-                    100 [label="Access variable R|<local>/b|" style="filled" fillcolor=gray];
-                    95 [label="Exit &&"];
-                }
-                101 [label="Exit when branch condition"];
-            }
-            107 [label="Synthetic else branch"];
-            102 [label="Enter when branch result"];
-            subgraph cluster_29 {
-                color=blue
-                103 [label="Enter block"];
-                104 [label="Const: Int(1)"];
-                105 [label="Exit block"];
-            }
-            106 [label="Exit when branch result"];
-            93 [label="Exit when"];
-        }
-        91 [label="Exit function test_6" style="filled" fillcolor=red];
-    }
-    90 -> {92};
-    92 -> {94};
-    93 -> {91};
-    94 -> {96};
-    95 -> {101};
+    88 -> {89};
+    89 -> {90};
+    90 -> {92 91};
+    91 -> {97};
+    92 -> {93};
+    93 -> {94};
+    94 -> {95};
+    95 -> {96};
     96 -> {97};
     97 -> {98};
-    98 -> {95};
-    98 -> {99} [style=dotted];
-    99 -> {100} [style=dotted];
-    100 -> {95} [style=dotted];
-    101 -> {102 107};
+    98 -> {99};
+
+    subgraph cluster_30 {
+        color=red
+        100 [label="Enter function test_6" style="filled" fillcolor=red];
+        subgraph cluster_31 {
+            color=blue
+            101 [label="Enter block"];
+            subgraph cluster_32 {
+                color=blue
+                102 [label="Enter when"];
+                subgraph cluster_33 {
+                    color=blue
+                    103 [label="Enter when branch condition "];
+                    subgraph cluster_34 {
+                        color=blue
+                        104 [label="Enter &&"];
+                        105 [label="Const: Boolean(false)"];
+                        106 [label="Exit left part of &&"];
+                        107 [label="Enter right part of &&" style="filled" fillcolor=gray];
+                        108 [label="Access variable R|<local>/b|" style="filled" fillcolor=gray];
+                        109 [label="Exit &&"];
+                    }
+                    110 [label="Exit when branch condition"];
+                }
+                111 [label="Synthetic else branch"];
+                112 [label="Enter when branch result"];
+                subgraph cluster_35 {
+                    color=blue
+                    113 [label="Enter block"];
+                    114 [label="Const: Int(1)"];
+                    115 [label="Exit block"];
+                }
+                116 [label="Exit when branch result"];
+                117 [label="Exit when"];
+            }
+            118 [label="Exit block"];
+        }
+        119 [label="Exit function test_6" style="filled" fillcolor=red];
+    }
+    100 -> {101};
+    101 -> {102};
     102 -> {103};
     103 -> {104};
     104 -> {105};
     105 -> {106};
-    106 -> {93};
-    107 -> {93};
-
-    subgraph cluster_30 {
-        color=red
-        108 [label="Enter function test_7" style="filled" fillcolor=red];
-        subgraph cluster_31 {
-            color=blue
-            110 [label="Enter when"];
-            subgraph cluster_32 {
-                color=blue
-                112 [label="Enter when branch condition "];
-                subgraph cluster_33 {
-                    color=blue
-                    114 [label="Enter &&"];
-                    115 [label="Access variable R|<local>/b|"];
-                    116 [label="Exit left part of &&"];
-                    117 [label="Enter right part of &&"];
-                    118 [label="Const: Boolean(true)"];
-                    113 [label="Exit &&"];
-                }
-                119 [label="Exit when branch condition"];
-            }
-            125 [label="Synthetic else branch"];
-            120 [label="Enter when branch result"];
-            subgraph cluster_34 {
-                color=blue
-                121 [label="Enter block"];
-                122 [label="Const: Int(1)"];
-                123 [label="Exit block"];
-            }
-            124 [label="Exit when branch result"];
-            111 [label="Exit when"];
-        }
-        109 [label="Exit function test_7" style="filled" fillcolor=red];
-    }
-    108 -> {110};
-    110 -> {112};
-    111 -> {109};
-    112 -> {114};
-    113 -> {119};
+    106 -> {109};
+    106 -> {107} [style=dotted];
+    107 -> {108} [style=dotted];
+    108 -> {109} [style=dotted];
+    109 -> {110};
+    110 -> {112 111};
+    111 -> {117};
+    112 -> {113};
+    113 -> {114};
     114 -> {115};
     115 -> {116};
-    116 -> {113 117};
+    116 -> {117};
     117 -> {118};
-    118 -> {113};
-    119 -> {120 125};
+    118 -> {119};
+
+    subgraph cluster_36 {
+        color=red
+        120 [label="Enter function test_7" style="filled" fillcolor=red];
+        subgraph cluster_37 {
+            color=blue
+            121 [label="Enter block"];
+            subgraph cluster_38 {
+                color=blue
+                122 [label="Enter when"];
+                subgraph cluster_39 {
+                    color=blue
+                    123 [label="Enter when branch condition "];
+                    subgraph cluster_40 {
+                        color=blue
+                        124 [label="Enter &&"];
+                        125 [label="Access variable R|<local>/b|"];
+                        126 [label="Exit left part of &&"];
+                        127 [label="Enter right part of &&"];
+                        128 [label="Const: Boolean(true)"];
+                        129 [label="Exit &&"];
+                    }
+                    130 [label="Exit when branch condition"];
+                }
+                131 [label="Synthetic else branch"];
+                132 [label="Enter when branch result"];
+                subgraph cluster_41 {
+                    color=blue
+                    133 [label="Enter block"];
+                    134 [label="Const: Int(1)"];
+                    135 [label="Exit block"];
+                }
+                136 [label="Exit when branch result"];
+                137 [label="Exit when"];
+            }
+            138 [label="Exit block"];
+        }
+        139 [label="Exit function test_7" style="filled" fillcolor=red];
+    }
     120 -> {121};
     121 -> {122};
     122 -> {123};
     123 -> {124};
-    124 -> {111};
-    125 -> {111};
-
-    subgraph cluster_35 {
-        color=red
-        126 [label="Enter function test_8" style="filled" fillcolor=red];
-        subgraph cluster_36 {
-            color=blue
-            128 [label="Enter when"];
-            subgraph cluster_37 {
-                color=blue
-                130 [label="Enter when branch condition "];
-                subgraph cluster_38 {
-                    color=blue
-                    132 [label="Enter &&"];
-                    133 [label="Const: Boolean(true)"];
-                    134 [label="Exit left part of &&"];
-                    135 [label="Enter right part of &&"];
-                    136 [label="Access variable R|<local>/b|"];
-                    131 [label="Exit &&"];
-                }
-                137 [label="Exit when branch condition"];
-            }
-            143 [label="Synthetic else branch"];
-            138 [label="Enter when branch result"];
-            subgraph cluster_39 {
-                color=blue
-                139 [label="Enter block"];
-                140 [label="Const: Int(1)"];
-                141 [label="Exit block"];
-            }
-            142 [label="Exit when branch result"];
-            129 [label="Exit when"];
-        }
-        127 [label="Exit function test_8" style="filled" fillcolor=red];
-    }
-    126 -> {128};
-    128 -> {130};
-    129 -> {127};
-    130 -> {132};
+    124 -> {125};
+    125 -> {126};
+    126 -> {129 127};
+    127 -> {128};
+    128 -> {129};
+    129 -> {130};
+    130 -> {132 131};
     131 -> {137};
     132 -> {133};
     133 -> {134};
     134 -> {135};
-    134 -> {131} [style=dotted];
     135 -> {136};
-    136 -> {131};
-    137 -> {138 143};
+    136 -> {137};
+    137 -> {138};
     138 -> {139};
-    139 -> {140};
+
+    subgraph cluster_42 {
+        color=red
+        140 [label="Enter function test_8" style="filled" fillcolor=red];
+        subgraph cluster_43 {
+            color=blue
+            141 [label="Enter block"];
+            subgraph cluster_44 {
+                color=blue
+                142 [label="Enter when"];
+                subgraph cluster_45 {
+                    color=blue
+                    143 [label="Enter when branch condition "];
+                    subgraph cluster_46 {
+                        color=blue
+                        144 [label="Enter &&"];
+                        145 [label="Const: Boolean(true)"];
+                        146 [label="Exit left part of &&"];
+                        147 [label="Enter right part of &&"];
+                        148 [label="Access variable R|<local>/b|"];
+                        149 [label="Exit &&"];
+                    }
+                    150 [label="Exit when branch condition"];
+                }
+                151 [label="Synthetic else branch"];
+                152 [label="Enter when branch result"];
+                subgraph cluster_47 {
+                    color=blue
+                    153 [label="Enter block"];
+                    154 [label="Const: Int(1)"];
+                    155 [label="Exit block"];
+                }
+                156 [label="Exit when branch result"];
+                157 [label="Exit when"];
+            }
+            158 [label="Exit block"];
+        }
+        159 [label="Exit function test_8" style="filled" fillcolor=red];
+    }
     140 -> {141};
     141 -> {142};
-    142 -> {129};
-    143 -> {129};
+    142 -> {143};
+    143 -> {144};
+    144 -> {145};
+    145 -> {146};
+    146 -> {147};
+    146 -> {149} [style=dotted];
+    147 -> {148};
+    148 -> {149};
+    149 -> {150};
+    150 -> {152 151};
+    151 -> {157};
+    152 -> {153};
+    153 -> {154};
+    154 -> {155};
+    155 -> {156};
+    156 -> {157};
+    157 -> {158};
+    158 -> {159};
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/complex.dot

@@ -5,106 +5,116 @@ digraph complex_kt {
 
     subgraph cluster_0 {
         color=red
-        0 [label="Enter function close" style="filled" fillcolor=red];
-        1 [label="Exit function close" style="filled" fillcolor=red];
+        0 [label="Enter class AutoCloseable" style="filled" fillcolor=red];
+        1 [label="Exit class AutoCloseable" style="filled" fillcolor=red];
     }
-    0 -> {1};
+    0 -> {1} [color=green];
 
     subgraph cluster_1 {
         color=red
-        2 [label="Enter class AutoCloseable" style="filled" fillcolor=red];
-        3 [label="Exit class AutoCloseable" style="filled" fillcolor=red];
+        2 [label="Enter function close" style="filled" fillcolor=red];
+        3 [label="Exit function close" style="filled" fillcolor=red];
     }
-    2 -> {3} [color=green];
+    2 -> {3};
 
     subgraph cluster_2 {
         color=red
         4 [label="Enter function addSuppressed" style="filled" fillcolor=red];
-        5 [label="Exit function addSuppressed" style="filled" fillcolor=red];
+        subgraph cluster_3 {
+            color=blue
+            5 [label="Enter block"];
+            6 [label="Exit block"];
+        }
+        7 [label="Exit function addSuppressed" style="filled" fillcolor=red];
     }
     4 -> {5};
+    5 -> {6};
+    6 -> {7};
 
-    subgraph cluster_3 {
+    subgraph cluster_4 {
         color=red
-        6 [label="Enter function closeFinally" style="filled" fillcolor=red];
-        subgraph cluster_4 {
+        8 [label="Enter function closeFinally" style="filled" fillcolor=red];
+        subgraph cluster_5 {
             color=blue
-            8 [label="Enter when"];
-            subgraph cluster_5 {
-                color=blue
-                10 [label="Enter when branch condition "];
-                11 [label="Access variable this@R|/closeFinally|"];
-                12 [label="Const: Null(null)"];
-                13 [label="Operator =="];
-                14 [label="Exit when branch condition"];
-            }
+            9 [label="Enter block"];
             subgraph cluster_6 {
                 color=blue
-                19 [label="Enter when branch condition "];
-                20 [label="Access variable R|<local>/cause|"];
-                21 [label="Const: Null(null)"];
-                22 [label="Operator =="];
-                23 [label="Exit when branch condition"];
-            }
-            subgraph cluster_7 {
-                color=blue
-                29 [label="Enter when branch condition else"];
-                30 [label="Exit when branch condition"];
-            }
-            31 [label="Enter when branch result"];
-            subgraph cluster_8 {
-                color=blue
-                32 [label="Enter block"];
+                10 [label="Enter when"];
+                subgraph cluster_7 {
+                    color=blue
+                    11 [label="Enter when branch condition "];
+                    12 [label="Access variable this@R|/closeFinally|"];
+                    13 [label="Const: Null(null)"];
+                    14 [label="Operator =="];
+                    15 [label="Exit when branch condition"];
+                }
+                subgraph cluster_8 {
+                    color=blue
+                    16 [label="Enter when branch condition "];
+                    17 [label="Access variable R|<local>/cause|"];
+                    18 [label="Const: Null(null)"];
+                    19 [label="Operator =="];
+                    20 [label="Exit when branch condition"];
+                }
                 subgraph cluster_9 {
                     color=blue
-                    33 [label="Try expression enter"];
-                    subgraph cluster_10 {
-                        color=blue
-                        35 [label="Try main block enter"];
-                        subgraph cluster_11 {
-                            color=blue
-                            37 [label="Enter block"];
-                            38 [label="Function call: this@R|/closeFinally|.R|/AutoCloseable.close|()"];
-                            39 [label="Exit block"];
-                        }
-                        40 [label="Try main block exit"];
-                    }
-                    subgraph cluster_12 {
-                        color=blue
-                        36 [label="Catch enter"];
-                        subgraph cluster_13 {
-                            color=blue
-                            41 [label="Enter block"];
-                            42 [label="Access variable R|<local>/cause|"];
-                            43 [label="Access variable R|<local>/closeException|"];
-                            44 [label="Function call: R|<local>/cause|.R|/addSuppressed|(...)"];
-                            45 [label="Exit block"];
-                        }
-                        46 [label="Catch exit"];
-                    }
-                    34 [label="Try expression exit"];
+                    21 [label="Enter when branch condition else"];
+                    22 [label="Exit when branch condition"];
                 }
-                47 [label="Exit block"];
+                23 [label="Enter when branch result"];
+                subgraph cluster_10 {
+                    color=blue
+                    24 [label="Enter block"];
+                    subgraph cluster_11 {
+                        color=blue
+                        25 [label="Try expression enter"];
+                        subgraph cluster_12 {
+                            color=blue
+                            26 [label="Try main block enter"];
+                            subgraph cluster_13 {
+                                color=blue
+                                27 [label="Enter block"];
+                                28 [label="Function call: this@R|/closeFinally|.R|/AutoCloseable.close|()"];
+                                29 [label="Exit block"];
+                            }
+                            30 [label="Try main block exit"];
+                        }
+                        subgraph cluster_14 {
+                            color=blue
+                            31 [label="Catch enter"];
+                            subgraph cluster_15 {
+                                color=blue
+                                32 [label="Enter block"];
+                                33 [label="Access variable R|<local>/cause|"];
+                                34 [label="Access variable R|<local>/closeException|"];
+                                35 [label="Function call: R|<local>/cause|.R|/addSuppressed|(...)"];
+                                36 [label="Exit block"];
+                            }
+                            37 [label="Catch exit"];
+                        }
+                        38 [label="Try expression exit"];
+                    }
+                    39 [label="Exit block"];
+                }
+                40 [label="Exit when branch result"];
+                41 [label="Enter when branch result"];
+                subgraph cluster_16 {
+                    color=blue
+                    42 [label="Enter block"];
+                    43 [label="Function call: this@R|/closeFinally|.R|/AutoCloseable.close|()"];
+                    44 [label="Exit block"];
+                }
+                45 [label="Exit when branch result"];
+                46 [label="Enter when branch result"];
+                subgraph cluster_17 {
+                    color=blue
+                    47 [label="Enter block"];
+                    48 [label="Exit block"];
+                }
+                49 [label="Exit when branch result"];
+                50 [label="Exit when"];
             }
-            48 [label="Exit when branch result"];
-            24 [label="Enter when branch result"];
-            subgraph cluster_14 {
-                color=blue
-                25 [label="Enter block"];
-                26 [label="Function call: this@R|/closeFinally|.R|/AutoCloseable.close|()"];
-                27 [label="Exit block"];
-            }
-            28 [label="Exit when branch result"];
-            15 [label="Enter when branch result"];
-            subgraph cluster_15 {
-                color=blue
-                16 [label="Enter block"];
-                17 [label="Exit block"];
-            }
-            18 [label="Exit when branch result"];
-            9 [label="Exit when"];
-        }
-        49 [label="Jump: ^closeFinally when () {
+            51 [label="Jump: ^closeFinally when () {
     ==(this@R|/closeFinally|, Null(null)) ->  {
     }
     ==(R|<local>/cause|, Null(null)) ->  {
@@ -121,149 +131,160 @@ digraph complex_kt {
     }
 }
 "];
-        50 [label="Stub" style="filled" fillcolor=gray];
-        7 [label="Exit function closeFinally" style="filled" fillcolor=red];
+            52 [label="Stub" style="filled" fillcolor=gray];
+            53 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        54 [label="Exit function closeFinally" style="filled" fillcolor=red];
     }
-    6 -> {8};
-    8 -> {10};
-    9 -> {49};
+    8 -> {9};
+    9 -> {10};
     10 -> {11};
     11 -> {12};
     12 -> {13};
     13 -> {14};
-    14 -> {15 19};
-    15 -> {16};
+    14 -> {15};
+    15 -> {46 16};
     16 -> {17};
     17 -> {18};
-    18 -> {9};
+    18 -> {19};
     19 -> {20};
-    20 -> {21};
+    20 -> {41 21};
     21 -> {22};
     22 -> {23};
-    23 -> {24 29};
+    23 -> {24};
     24 -> {25};
     25 -> {26};
-    26 -> {27};
+    26 -> {54 31 27};
     27 -> {28};
-    28 -> {9};
+    28 -> {29};
     29 -> {30};
-    30 -> {31};
-    31 -> {32};
+    30 -> {38};
+    31 -> {54 32};
     32 -> {33};
-    33 -> {35};
-    34 -> {47};
-    35 -> {7 36 37};
-    36 -> {7 41};
+    33 -> {34};
+    34 -> {35};
+    35 -> {36};
+    36 -> {37};
     37 -> {38};
     38 -> {39};
     39 -> {40};
-    40 -> {34};
+    40 -> {50};
     41 -> {42};
     42 -> {43};
     43 -> {44};
     44 -> {45};
-    45 -> {46};
-    46 -> {34};
+    45 -> {50};
+    46 -> {47};
     47 -> {48};
-    48 -> {9};
-    49 -> {7};
-    49 -> {50} [style=dotted];
-    50 -> {7} [style=dotted];
+    48 -> {49};
+    49 -> {50};
+    50 -> {51};
+    51 -> {54};
+    51 -> {52} [style=dotted];
+    52 -> {53} [style=dotted];
+    53 -> {54} [style=dotted];
 
-    subgraph cluster_16 {
+    subgraph cluster_18 {
         color=red
-        51 [label="Enter function firstIsInstanceOrNull" style="filled" fillcolor=red];
-        53 [label="Access variable this@R|/firstIsInstanceOrNull|"];
-        54 [label="Function call: this@R|/firstIsInstanceOrNull|.R|FakeOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<kotlin/Any?>|>|()"];
-        55 [label="Variable declaration: lval <iterator>: R|kotlin/collections/Iterator<kotlin/Any?>|"];
-        subgraph cluster_17 {
+        55 [label="Enter function firstIsInstanceOrNull" style="filled" fillcolor=red];
+        subgraph cluster_19 {
             color=blue
-            56 [label="Enter while loop"];
-            subgraph cluster_18 {
+            56 [label="Enter block"];
+            57 [label="Access variable this@R|/firstIsInstanceOrNull|"];
+            58 [label="Function call: this@R|/firstIsInstanceOrNull|.R|FakeOverride<kotlin/collections/List.iterator: R|kotlin/collections/Iterator<kotlin/Any?>|>|()"];
+            59 [label="Variable declaration: lval <iterator>: R|kotlin/collections/Iterator<kotlin/Any?>|"];
+            subgraph cluster_20 {
                 color=blue
-                58 [label="Enter loop condition"];
-                59 [label="Access variable R|<local>/<iterator>|"];
-                60 [label="Function call: R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()"];
-                61 [label="Exit loop condition"];
-            }
-            subgraph cluster_19 {
-                color=blue
-                62 [label="Enter loop block"];
-                subgraph cluster_20 {
+                60 [label="Enter while loop"];
+                subgraph cluster_21 {
                     color=blue
-                    63 [label="Enter block"];
-                    64 [label="Access variable R|<local>/<iterator>|"];
-                    65 [label="Function call: R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|kotlin/Any?|>|()"];
-                    66 [label="Variable declaration: lval element: R|kotlin/Any?|"];
-                    subgraph cluster_21 {
-                        color=blue
-                        67 [label="Enter when"];
-                        subgraph cluster_22 {
-                            color=blue
-                            69 [label="Enter when branch condition "];
-                            70 [label="Access variable R|<local>/element|"];
-                            71 [label="Type operator: (R|<local>/element| is R|T|)"];
-                            72 [label="Exit when branch condition"];
-                        }
-                        80 [label="Synthetic else branch"];
-                        73 [label="Enter when branch result"];
-                        subgraph cluster_23 {
-                            color=blue
-                            74 [label="Enter block"];
-                            75 [label="Access variable R|<local>/element|"];
-                            76 [label="Jump: ^firstIsInstanceOrNull R|<local>/element|"];
-                            77 [label="Stub" style="filled" fillcolor=gray];
-                            78 [label="Exit block" style="filled" fillcolor=gray];
-                        }
-                        79 [label="Exit when branch result" style="filled" fillcolor=gray];
-                        68 [label="Exit when"];
-                    }
-                    81 [label="Exit block"];
+                    61 [label="Enter loop condition"];
+                    62 [label="Access variable R|<local>/<iterator>|"];
+                    63 [label="Function call: R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()"];
+                    64 [label="Exit loop condition"];
                 }
-                82 [label="Exit loop block"];
+                subgraph cluster_22 {
+                    color=blue
+                    65 [label="Enter loop block"];
+                    subgraph cluster_23 {
+                        color=blue
+                        66 [label="Enter block"];
+                        67 [label="Access variable R|<local>/<iterator>|"];
+                        68 [label="Function call: R|<local>/<iterator>|.R|FakeOverride<kotlin/collections/Iterator.next: R|kotlin/Any?|>|()"];
+                        69 [label="Variable declaration: lval element: R|kotlin/Any?|"];
+                        subgraph cluster_24 {
+                            color=blue
+                            70 [label="Enter when"];
+                            subgraph cluster_25 {
+                                color=blue
+                                71 [label="Enter when branch condition "];
+                                72 [label="Access variable R|<local>/element|"];
+                                73 [label="Type operator: (R|<local>/element| is R|T|)"];
+                                74 [label="Exit when branch condition"];
+                            }
+                            75 [label="Synthetic else branch"];
+                            76 [label="Enter when branch result"];
+                            subgraph cluster_26 {
+                                color=blue
+                                77 [label="Enter block"];
+                                78 [label="Access variable R|<local>/element|"];
+                                79 [label="Jump: ^firstIsInstanceOrNull R|<local>/element|"];
+                                80 [label="Stub" style="filled" fillcolor=gray];
+                                81 [label="Exit block" style="filled" fillcolor=gray];
+                            }
+                            82 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            83 [label="Exit when"];
+                        }
+                        84 [label="Exit block"];
+                    }
+                    85 [label="Exit loop block"];
+                }
+                86 [label="Exit whileloop"];
             }
-            57 [label="Exit whileloop"];
+            87 [label="Const: Null(null)"];
+            88 [label="Jump: ^firstIsInstanceOrNull Null(null)"];
+            89 [label="Stub" style="filled" fillcolor=gray];
+            90 [label="Exit block" style="filled" fillcolor=gray];
         }
-        83 [label="Const: Null(null)"];
-        84 [label="Jump: ^firstIsInstanceOrNull Null(null)"];
-        85 [label="Stub" style="filled" fillcolor=gray];
-        52 [label="Exit function firstIsInstanceOrNull" style="filled" fillcolor=red];
+        91 [label="Exit function firstIsInstanceOrNull" style="filled" fillcolor=red];
     }
-    51 -> {53};
-    53 -> {54};
-    54 -> {55};
     55 -> {56};
-    56 -> {58};
-    57 -> {83};
+    56 -> {57};
+    57 -> {58};
     58 -> {59};
     59 -> {60};
     60 -> {61};
-    61 -> {57 62};
+    61 -> {62};
     62 -> {63};
     63 -> {64};
-    64 -> {65};
+    64 -> {86 65};
     65 -> {66};
     66 -> {67};
-    67 -> {69};
-    68 -> {81};
+    67 -> {68};
+    68 -> {69};
     69 -> {70};
     70 -> {71};
     71 -> {72};
-    72 -> {73 80};
+    72 -> {73};
     73 -> {74};
-    74 -> {75};
-    75 -> {76};
-    76 -> {52};
-    76 -> {77} [style=dotted];
-    77 -> {78} [style=dotted];
-    78 -> {79} [style=dotted];
-    79 -> {68} [style=dotted];
-    80 -> {68};
-    81 -> {82};
-    82 -> {58};
+    74 -> {76 75};
+    75 -> {83};
+    76 -> {77};
+    77 -> {78};
+    78 -> {79};
+    79 -> {91};
+    79 -> {80} [style=dotted];
+    80 -> {81} [style=dotted];
+    81 -> {82} [style=dotted];
+    82 -> {83} [style=dotted];
     83 -> {84};
-    84 -> {52};
-    84 -> {85} [style=dotted];
-    85 -> {52} [style=dotted];
+    84 -> {85};
+    85 -> {61} [color=green style=dashed];
+    86 -> {87};
+    87 -> {88};
+    88 -> {91};
+    88 -> {89} [style=dotted];
+    89 -> {90} [style=dotted];
+    90 -> {91} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.dot

@@ -0,0 +1,85 @@
+digraph defaultArguments_kt {
+    graph [nodesep=3]
+    node [shape=box penwidth=2]
+    edge [penwidth=2]
+
+    subgraph cluster_0 {
+        color=red
+        0 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_1 {
+            color=blue
+            1 [label="Enter block"];
+            2 [label="Const: Int(1)"];
+            3 [label="Jump: ^foo Int(1)"];
+            4 [label="Stub" style="filled" fillcolor=gray];
+            5 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        6 [label="Exit function foo" style="filled" fillcolor=red];
+    }
+    0 -> {1};
+    1 -> {2};
+    2 -> {3};
+    3 -> {6};
+    3 -> {4} [style=dotted];
+    4 -> {5} [style=dotted];
+    5 -> {6} [style=dotted];
+
+    subgraph cluster_2 {
+        color=red
+        7 [label="Enter function test" style="filled" fillcolor=red];
+        subgraph cluster_3 {
+            color=blue
+            16 [label="Enter default value of z" style="filled" fillcolor=red];
+            17 [label="Postponed enter to lambda"];
+            subgraph cluster_4 {
+                color=blue
+                22 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_5 {
+                    color=blue
+                    23 [label="Enter block"];
+                    24 [label="Function call: R|/foo|()"];
+                    25 [label="Exit block"];
+                }
+                26 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            18 [label="Call arguments union" style="filled" fillcolor=yellow];
+            19 [label="Postponed exit from lambda"];
+            20 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
+            21 [label="Exit default value of z" style="filled" fillcolor=red];
+        }
+        subgraph cluster_6 {
+            color=blue
+            12 [label="Enter default value of y" style="filled" fillcolor=red];
+            13 [label="Access variable R|<local>/x|"];
+            14 [label="Type operator: (R|<local>/x| as R|kotlin/String|)"];
+            15 [label="Exit default value of y" style="filled" fillcolor=red];
+        }
+        subgraph cluster_7 {
+            color=blue
+            8 [label="Enter block"];
+            9 [label="Function call: R|/foo|()"];
+            10 [label="Exit block"];
+        }
+        11 [label="Exit function test" style="filled" fillcolor=red];
+    }
+    7 -> {12 16 8};
+    8 -> {9};
+    9 -> {10};
+    10 -> {11};
+    12 -> {13};
+    13 -> {14};
+    14 -> {15};
+    16 -> {17};
+    17 -> {22};
+    17 -> {19} [color=red];
+    18 -> {20} [color=red];
+    19 -> {20} [color=green];
+    20 -> {21};
+    22 -> {23};
+    23 -> {24};
+    24 -> {25};
+    25 -> {26};
+    26 -> {18} [color=red];
+    26 -> {19} [color=green];
+
+}

compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.kt

@@ -0,0 +1,7 @@
+// !DUMP_CFG
+
+fun foo(): Int = 1
+
+fun test(x: Any, y: String = x as String, z: Int = run { foo() }) {
+    foo()
+}

compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.txt

@@ -0,0 +1,10 @@
+FILE: defaultArguments.kt
+    public final fun foo(): R|kotlin/Int| {
+        ^foo Int(1)
+    }
+    public final fun test(x: R|kotlin/Any|, y: R|kotlin/String| = (R|<local>/x| as R|kotlin/String|), z: R|kotlin/Int| = R|kotlin/run|<R|kotlin/Int|>(<L> = run@fun <anonymous>(): R|kotlin/Int| <kind=EXACTLY_ONCE>  {
+        ^ R|/foo|()
+    }
+    )): R|kotlin/Unit| {
+        R|/foo|()
+    }

compiler/fir/analysis-tests/testData/resolve/cfg/emptyWhen.dot

@@ -8,53 +8,74 @@ digraph emptyWhen_kt {
         0 [label="Enter function test_1" style="filled" fillcolor=red];
         subgraph cluster_1 {
             color=blue
-            2 [label="Enter when"];
-            4 [label="Synthetic else branch"];
-            3 [label="Exit when"];
+            1 [label="Enter block"];
+            subgraph cluster_2 {
+                color=blue
+                2 [label="Enter when"];
+                3 [label="Synthetic else branch"];
+                4 [label="Exit when"];
+            }
+            5 [label="Exit block"];
         }
-        1 [label="Exit function test_1" style="filled" fillcolor=red];
+        6 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    0 -> {2};
-    2 -> {4};
-    3 -> {1};
-    4 -> {3};
+    0 -> {1};
+    1 -> {2};
+    2 -> {3};
+    3 -> {4};
+    4 -> {5};
+    5 -> {6};
 
-    subgraph cluster_2 {
+    subgraph cluster_3 {
         color=red
-        5 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_3 {
+        7 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_4 {
             color=blue
-            7 [label="Enter when"];
-            9 [label="Access variable R|<local>/x|"];
-            10 [label="Synthetic else branch"];
-            8 [label="Exit when"];
+            8 [label="Enter block"];
+            subgraph cluster_5 {
+                color=blue
+                9 [label="Enter when"];
+                10 [label="Access variable R|<local>/x|"];
+                11 [label="Synthetic else branch"];
+                12 [label="Exit when"];
+            }
+            13 [label="Exit block"];
         }
-        6 [label="Exit function test_2" style="filled" fillcolor=red];
+        14 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    5 -> {7};
-    7 -> {9};
-    8 -> {6};
+    7 -> {8};
+    8 -> {9};
     9 -> {10};
-    10 -> {8};
+    10 -> {11};
+    11 -> {12};
+    12 -> {13};
+    13 -> {14};
 
-    subgraph cluster_4 {
+    subgraph cluster_6 {
         color=red
-        11 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_5 {
+        15 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_7 {
             color=blue
-            13 [label="Enter when"];
-            15 [label="Access variable R|<local>/x|"];
-            16 [label="Variable declaration: lval y: R|kotlin/Int|"];
-            17 [label="Synthetic else branch"];
-            14 [label="Exit when"];
+            16 [label="Enter block"];
+            subgraph cluster_8 {
+                color=blue
+                17 [label="Enter when"];
+                18 [label="Access variable R|<local>/x|"];
+                19 [label="Variable declaration: lval y: R|kotlin/Int|"];
+                20 [label="Synthetic else branch"];
+                21 [label="Exit when"];
+            }
+            22 [label="Exit block"];
         }
-        12 [label="Exit function test_3" style="filled" fillcolor=red];
+        23 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    11 -> {13};
-    13 -> {15};
-    14 -> {12};
     15 -> {16};
     16 -> {17};
-    17 -> {14};
+    17 -> {18};
+    18 -> {19};
+    19 -> {20};
+    20 -> {21};
+    21 -> {22};
+    22 -> {23};
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.dot

@@ -6,428 +6,579 @@ digraph flowFromInplaceLambda_kt {
     subgraph cluster_0 {
         color=red
         0 [label="Enter function takeInt" style="filled" fillcolor=red];
-        1 [label="Exit function takeInt" style="filled" fillcolor=red];
+        subgraph cluster_1 {
+            color=blue
+            1 [label="Enter block"];
+            2 [label="Exit block"];
+        }
+        3 [label="Exit function takeInt" style="filled" fillcolor=red];
     }
     0 -> {1};
-
-    subgraph cluster_1 {
-        color=red
-        2 [label="Enter function select" style="filled" fillcolor=red];
-        4 [label="Access variable R|<local>/x|"];
-        5 [label="Const: Int(0)"];
-        6 [label="Function call: R|<local>/x|.R|FakeOverride<kotlin/Array.get: R|K|>|(...)"];
-        7 [label="Jump: ^select R|<local>/x|.R|FakeOverride<kotlin/Array.get: R|K|>|(Int(0))"];
-        8 [label="Stub" style="filled" fillcolor=gray];
-        3 [label="Exit function select" style="filled" fillcolor=red];
-    }
-    2 -> {4};
-    4 -> {5};
-    5 -> {6};
-    6 -> {7};
-    7 -> {3};
-    7 -> {8} [style=dotted];
-    8 -> {3} [style=dotted];
+    1 -> {2};
+    2 -> {3};
 
     subgraph cluster_2 {
         color=red
-        9 [label="Enter function id" style="filled" fillcolor=red];
-        11 [label="Access variable R|<local>/x|"];
-        12 [label="Jump: ^id R|<local>/x|"];
-        13 [label="Stub" style="filled" fillcolor=gray];
-        10 [label="Exit function id" style="filled" fillcolor=red];
+        4 [label="Enter function select" style="filled" fillcolor=red];
+        subgraph cluster_3 {
+            color=blue
+            5 [label="Enter block"];
+            6 [label="Access variable R|<local>/x|"];
+            7 [label="Const: Int(0)"];
+            8 [label="Function call: R|<local>/x|.R|FakeOverride<kotlin/Array.get: R|K|>|(...)"];
+            9 [label="Jump: ^select R|<local>/x|.R|FakeOverride<kotlin/Array.get: R|K|>|(Int(0))"];
+            10 [label="Stub" style="filled" fillcolor=gray];
+            11 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        12 [label="Exit function select" style="filled" fillcolor=red];
     }
-    9 -> {11};
-    11 -> {12};
-    12 -> {10};
-    12 -> {13} [style=dotted];
-    13 -> {10} [style=dotted];
-
-    subgraph cluster_3 {
-        color=red
-        14 [label="Enter function materialize" style="filled" fillcolor=red];
-        16 [label="Const: Null(null)"];
-        17 [label="Check not null: Null(null)!!"];
-        18 [label="Jump: ^materialize Null(null)!!"];
-        19 [label="Stub" style="filled" fillcolor=gray];
-        15 [label="Exit function materialize" style="filled" fillcolor=red];
-    }
-    14 -> {16};
-    16 -> {17};
-    17 -> {18};
-    18 -> {15};
-    18 -> {19} [style=dotted];
-    19 -> {15} [style=dotted];
+    4 -> {5};
+    5 -> {6};
+    6 -> {7};
+    7 -> {8};
+    8 -> {9};
+    9 -> {12};
+    9 -> {10} [style=dotted];
+    10 -> {11} [style=dotted];
+    11 -> {12} [style=dotted];
 
     subgraph cluster_4 {
         color=red
-        20 [label="Enter function myRun" style="filled" fillcolor=red];
-        22 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|R|>|()"];
-        23 [label="Jump: ^myRun R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|R|>|()"];
-        24 [label="Stub" style="filled" fillcolor=gray];
-        21 [label="Exit function myRun" style="filled" fillcolor=red];
+        13 [label="Enter function id" style="filled" fillcolor=red];
+        subgraph cluster_5 {
+            color=blue
+            14 [label="Enter block"];
+            15 [label="Access variable R|<local>/x|"];
+            16 [label="Jump: ^id R|<local>/x|"];
+            17 [label="Stub" style="filled" fillcolor=gray];
+            18 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        19 [label="Exit function id" style="filled" fillcolor=red];
     }
-    20 -> {22};
+    13 -> {14};
+    14 -> {15};
+    15 -> {16};
+    16 -> {19};
+    16 -> {17} [style=dotted];
+    17 -> {18} [style=dotted];
+    18 -> {19} [style=dotted];
+
+    subgraph cluster_6 {
+        color=red
+        20 [label="Enter function materialize" style="filled" fillcolor=red];
+        subgraph cluster_7 {
+            color=blue
+            21 [label="Enter block"];
+            22 [label="Const: Null(null)"];
+            23 [label="Check not null: Null(null)!!"];
+            24 [label="Jump: ^materialize Null(null)!!"];
+            25 [label="Stub" style="filled" fillcolor=gray];
+            26 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        27 [label="Exit function materialize" style="filled" fillcolor=red];
+    }
+    20 -> {21};
+    21 -> {22};
     22 -> {23};
-    23 -> {21};
-    23 -> {24} [style=dotted];
-    24 -> {21} [style=dotted];
+    23 -> {24};
+    24 -> {27};
+    24 -> {25} [style=dotted];
+    25 -> {26} [style=dotted];
+    26 -> {27} [style=dotted];
 
-    subgraph cluster_5 {
+    subgraph cluster_8 {
         color=red
-        25 [label="Enter function test_1" style="filled" fillcolor=red];
-        27 [label="Postponed enter to lambda"];
-        subgraph cluster_6 {
-            color=blue
-            33 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            35 [label="Access variable R|<local>/x|"];
-            36 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
-            34 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-        }
-        30 [label="Call arguments union" style="filled" fillcolor=yellow];
-        28 [label="Postponed exit from lambda"];
-        29 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
-        31 [label="Access variable R|<local>/x|"];
-        32 [label="Function call: R|/takeInt|(...)"];
-        26 [label="Exit function test_1" style="filled" fillcolor=red];
-    }
-    25 -> {27};
-    27 -> {33};
-    27 -> {28} [color=red];
-    28 -> {29} [color=green];
-    29 -> {31};
-    30 -> {29} [color=red];
-    31 -> {32};
-    32 -> {26};
-    33 -> {35};
-    34 -> {28} [color=green];
-    34 -> {30} [color=red];
-    35 -> {36};
-    36 -> {34};
-
-    subgraph cluster_7 {
-        color=red
-        37 [label="Enter function test_2" style="filled" fillcolor=red];
-        39 [label="Postponed enter to lambda"];
-        subgraph cluster_8 {
-            color=blue
-            58 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            60 [label="Access variable R|<local>/y|"];
-            61 [label="Function call: R|<local>/y|.<Unresolved name: inc>#()"];
-            62 [label="Access variable R|<local>/x|"];
-            63 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
-            59 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-        }
-        40 [label="Postponed exit from lambda"];
-        41 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
-        43 [label="Call arguments union" style="filled" fillcolor=yellow];
-        42 [label="Function call: R|/id|<R|kotlin/Int|>(...)"];
-        44 [label="Access variable R|<local>/y|"];
-        45 [label="Type operator: (R|<local>/y| as R|kotlin/Int|)"];
-        46 [label="Postponed enter to lambda"];
+        28 [label="Enter function myRun" style="filled" fillcolor=red];
         subgraph cluster_9 {
             color=blue
-            64 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            66 [label="Access variable R|<local>/x|"];
-            67 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
-            68 [label="Access variable R|<local>/y|"];
-            69 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
-            70 [label="Const: Int(1)"];
-            65 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            29 [label="Enter block"];
+            30 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|R|>|()"];
+            31 [label="Jump: ^myRun R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|R|>|()"];
+            32 [label="Stub" style="filled" fillcolor=gray];
+            33 [label="Exit block" style="filled" fillcolor=gray];
         }
-        47 [label="Postponed exit from lambda"];
-        48 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
-        50 [label="Call arguments union" style="filled" fillcolor=yellow];
-        49 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
-        51 [label="Variable declaration: lval a: R|kotlin/Int|"];
-        52 [label="Access variable R|<local>/x|"];
-        53 [label="Function call: R|/takeInt|(...)"];
-        54 [label="Access variable R|<local>/y|"];
-        55 [label="Function call: R|/takeInt|(...)"];
-        56 [label="Access variable R|<local>/a|"];
-        57 [label="Function call: R|/takeInt|(...)"];
-        38 [label="Exit function test_2" style="filled" fillcolor=red];
+        34 [label="Exit function myRun" style="filled" fillcolor=red];
     }
-    37 -> {39};
-    39 -> {58};
-    39 -> {40} [color=red];
+    28 -> {29};
+    29 -> {30};
+    30 -> {31};
+    31 -> {34};
+    31 -> {32} [style=dotted];
+    32 -> {33} [style=dotted];
+    33 -> {34} [style=dotted];
+
+    subgraph cluster_10 {
+        color=red
+        35 [label="Enter function test_1" style="filled" fillcolor=red];
+        subgraph cluster_11 {
+            color=blue
+            36 [label="Enter block"];
+            37 [label="Postponed enter to lambda"];
+            subgraph cluster_12 {
+                color=blue
+                45 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_13 {
+                    color=blue
+                    46 [label="Enter block"];
+                    47 [label="Access variable R|<local>/x|"];
+                    48 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
+                    49 [label="Exit block"];
+                }
+                50 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            38 [label="Call arguments union" style="filled" fillcolor=yellow];
+            39 [label="Postponed exit from lambda"];
+            40 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
+            41 [label="Access variable R|<local>/x|"];
+            42 [label="Function call: R|/takeInt|(...)"];
+            43 [label="Exit block"];
+        }
+        44 [label="Exit function test_1" style="filled" fillcolor=red];
+    }
+    35 -> {36};
+    36 -> {37};
+    37 -> {45};
+    37 -> {39} [color=red];
+    38 -> {40} [color=red];
+    39 -> {40} [color=green];
     40 -> {41};
-    41 -> {43};
-    42 -> {44};
-    43 -> {42};
-    44 -> {45};
+    41 -> {42};
+    42 -> {43};
+    43 -> {44};
     45 -> {46};
-    46 -> {64};
-    46 -> {47} [color=red];
+    46 -> {47};
     47 -> {48};
-    48 -> {50};
-    49 -> {51};
-    50 -> {49};
+    48 -> {49};
+    49 -> {50};
+    50 -> {38} [color=red];
+    50 -> {39} [color=green];
+
+    subgraph cluster_14 {
+        color=red
+        51 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_15 {
+            color=blue
+            52 [label="Enter block"];
+            53 [label="Postponed enter to lambda"];
+            subgraph cluster_16 {
+                color=blue
+                74 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_17 {
+                    color=blue
+                    75 [label="Enter block"];
+                    76 [label="Access variable R|<local>/y|"];
+                    77 [label="Function call: R|<local>/y|.<Unresolved name: inc>#()"];
+                    78 [label="Access variable R|<local>/x|"];
+                    79 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
+                    80 [label="Exit block"];
+                }
+                81 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            54 [label="Postponed exit from lambda"];
+            55 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
+            56 [label="Call arguments union" style="filled" fillcolor=yellow];
+            57 [label="Function call: R|/id|<R|kotlin/Int|>(...)"];
+            58 [label="Access variable R|<local>/y|"];
+            59 [label="Type operator: (R|<local>/y| as R|kotlin/Int|)"];
+            60 [label="Postponed enter to lambda"];
+            subgraph cluster_18 {
+                color=blue
+                82 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_19 {
+                    color=blue
+                    83 [label="Enter block"];
+                    84 [label="Access variable R|<local>/x|"];
+                    85 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+                    86 [label="Access variable R|<local>/y|"];
+                    87 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
+                    88 [label="Const: Int(1)"];
+                    89 [label="Exit block"];
+                }
+                90 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            61 [label="Postponed exit from lambda"];
+            62 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
+            63 [label="Call arguments union" style="filled" fillcolor=yellow];
+            64 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
+            65 [label="Variable declaration: lval a: R|kotlin/Int|"];
+            66 [label="Access variable R|<local>/x|"];
+            67 [label="Function call: R|/takeInt|(...)"];
+            68 [label="Access variable R|<local>/y|"];
+            69 [label="Function call: R|/takeInt|(...)"];
+            70 [label="Access variable R|<local>/a|"];
+            71 [label="Function call: R|/takeInt|(...)"];
+            72 [label="Exit block"];
+        }
+        73 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
     51 -> {52};
     52 -> {53};
-    53 -> {54};
+    53 -> {74};
+    53 -> {54} [color=red];
     54 -> {55};
     55 -> {56};
     56 -> {57};
-    57 -> {38};
-    58 -> {60};
-    59 -> {40} [color=green];
-    59 -> {43} [color=red];
-    60 -> {61};
+    57 -> {58};
+    58 -> {59};
+    59 -> {60};
+    60 -> {82};
+    60 -> {61} [color=red];
     61 -> {62};
     62 -> {63};
-    63 -> {59};
-    64 -> {66};
-    65 -> {47} [color=green];
-    65 -> {50} [color=red];
+    63 -> {64};
+    64 -> {65};
+    65 -> {66};
     66 -> {67};
     67 -> {68};
     68 -> {69};
     69 -> {70};
-    70 -> {65};
-
-    subgraph cluster_10 {
-        color=red
-        71 [label="Enter function test_3" style="filled" fillcolor=red];
-        73 [label="Postponed enter to lambda"];
-        subgraph cluster_11 {
-            color=blue
-            89 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            91 [label="Access variable R|<local>/y|"];
-            92 [label="Function call: R|<local>/y|.<Unresolved name: inc>#()"];
-            93 [label="Access variable R|<local>/x|"];
-            94 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
-            95 [label="Function call: R|/materialize|<R|kotlin/Int|>()"];
-            90 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-        }
-        74 [label="Postponed exit from lambda"];
-        75 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
-        76 [label="Function call: R|/id|<R|kotlin/Int|>(...)"];
-        77 [label="Postponed enter to lambda"];
-        subgraph cluster_12 {
-            color=blue
-            96 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            98 [label="Access variable R|<local>/y|"];
-            99 [label="Type operator: (R|<local>/y| as R|kotlin/Int|)"];
-            100 [label="Access variable R|<local>/x|"];
-            101 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()"];
-            102 [label="Access variable R|<local>/y|"];
-            103 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
-            104 [label="Const: Int(1)"];
-            97 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-        }
-        78 [label="Postponed exit from lambda"];
-        79 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
-        81 [label="Call arguments union" style="filled" fillcolor=yellow];
-        80 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
-        82 [label="Variable declaration: lval a: R|kotlin/Int|"];
-        83 [label="Access variable R|<local>/x|"];
-        84 [label="Function call: R|/takeInt|(...)"];
-        85 [label="Access variable R|<local>/y|"];
-        86 [label="Function call: R|/takeInt|(...)"];
-        87 [label="Access variable R|<local>/a|"];
-        88 [label="Function call: R|/takeInt|(...)"];
-        72 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
-    71 -> {73};
-    73 -> {89};
-    73 -> {74} [color=red];
+    70 -> {71};
+    71 -> {72};
+    72 -> {73};
     74 -> {75};
     75 -> {76};
     76 -> {77};
-    77 -> {96};
-    77 -> {78} [color=red];
+    77 -> {78};
     78 -> {79};
-    79 -> {81};
-    80 -> {82};
-    81 -> {80};
+    79 -> {80};
+    80 -> {81};
+    81 -> {56} [color=red];
+    81 -> {54} [color=green];
     82 -> {83};
     83 -> {84};
     84 -> {85};
     85 -> {86};
     86 -> {87};
     87 -> {88};
-    88 -> {72};
-    89 -> {91};
-    90 -> {74} [color=green];
-    90 -> {81} [color=red];
+    88 -> {89};
+    89 -> {90};
+    90 -> {63} [color=red];
+    90 -> {61} [color=green];
+
+    subgraph cluster_20 {
+        color=red
+        91 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_21 {
+            color=blue
+            92 [label="Enter block"];
+            93 [label="Postponed enter to lambda"];
+            subgraph cluster_22 {
+                color=blue
+                111 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_23 {
+                    color=blue
+                    112 [label="Enter block"];
+                    113 [label="Access variable R|<local>/y|"];
+                    114 [label="Function call: R|<local>/y|.<Unresolved name: inc>#()"];
+                    115 [label="Access variable R|<local>/x|"];
+                    116 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
+                    117 [label="Function call: R|/materialize|<R|kotlin/Int|>()"];
+                    118 [label="Exit block"];
+                }
+                119 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            94 [label="Postponed exit from lambda"];
+            95 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
+            96 [label="Function call: R|/id|<R|kotlin/Int|>(...)"];
+            97 [label="Postponed enter to lambda"];
+            subgraph cluster_24 {
+                color=blue
+                120 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_25 {
+                    color=blue
+                    121 [label="Enter block"];
+                    122 [label="Access variable R|<local>/y|"];
+                    123 [label="Type operator: (R|<local>/y| as R|kotlin/Int|)"];
+                    124 [label="Access variable R|<local>/x|"];
+                    125 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()"];
+                    126 [label="Access variable R|<local>/y|"];
+                    127 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
+                    128 [label="Const: Int(1)"];
+                    129 [label="Exit block"];
+                }
+                130 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            98 [label="Postponed exit from lambda"];
+            99 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
+            100 [label="Call arguments union" style="filled" fillcolor=yellow];
+            101 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
+            102 [label="Variable declaration: lval a: R|kotlin/Int|"];
+            103 [label="Access variable R|<local>/x|"];
+            104 [label="Function call: R|/takeInt|(...)"];
+            105 [label="Access variable R|<local>/y|"];
+            106 [label="Function call: R|/takeInt|(...)"];
+            107 [label="Access variable R|<local>/a|"];
+            108 [label="Function call: R|/takeInt|(...)"];
+            109 [label="Exit block"];
+        }
+        110 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
     91 -> {92};
     92 -> {93};
-    93 -> {94};
+    93 -> {111};
+    93 -> {94} [color=red];
     94 -> {95};
-    95 -> {90};
-    96 -> {98};
-    97 -> {78} [color=green];
-    97 -> {81} [color=red];
+    95 -> {96};
+    96 -> {97};
+    97 -> {120};
+    97 -> {98} [color=red];
     98 -> {99};
     99 -> {100};
     100 -> {101};
     101 -> {102};
     102 -> {103};
     103 -> {104};
-    104 -> {97};
-
-    subgraph cluster_13 {
-        color=red
-        105 [label="Enter function test_4" style="filled" fillcolor=red];
-        107 [label="Postponed enter to lambda"];
-        subgraph cluster_14 {
-            color=blue
-            124 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            126 [label="Access variable R|<local>/y|"];
-            127 [label="Function call: R|<local>/y|.<Unresolved name: inc>#()"];
-            128 [label="Access variable R|<local>/x|"];
-            129 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
-            125 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-        }
-        108 [label="Postponed exit from lambda"];
-        109 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
-        110 [label="Function call: R|/id|<R|kotlin/Int|>(...)"];
-        111 [label="Access variable R|<local>/y|"];
-        112 [label="Type operator: (R|<local>/y| as R|kotlin/Int|)"];
-        113 [label="Postponed enter to lambda"];
-        subgraph cluster_15 {
-            color=blue
-            130 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            132 [label="Access variable R|<local>/x|"];
-            133 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()"];
-            134 [label="Access variable R|<local>/y|"];
-            135 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
-            136 [label="Const: Int(1)"];
-            131 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-        }
-        114 [label="Postponed exit from lambda"];
-        115 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
-        116 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
-        117 [label="Variable declaration: lval a: R|kotlin/Int|"];
-        118 [label="Access variable R|<local>/x|"];
-        119 [label="Function call: <Inapplicable(INAPPLICABLE): [/takeInt]>#(...)"];
-        120 [label="Access variable R|<local>/y|"];
-        121 [label="Function call: R|/takeInt|(...)"];
-        122 [label="Access variable R|<local>/a|"];
-        123 [label="Function call: R|/takeInt|(...)"];
-        106 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
-    105 -> {107};
+    104 -> {105};
+    105 -> {106};
+    106 -> {107};
     107 -> {108};
-    107 -> {124} [color=red];
     108 -> {109};
     109 -> {110};
-    110 -> {111};
     111 -> {112};
     112 -> {113};
     113 -> {114};
-    113 -> {130} [color=red];
     114 -> {115};
     115 -> {116};
     116 -> {117};
     117 -> {118};
     118 -> {119};
-    119 -> {120};
+    119 -> {100} [color=red];
+    119 -> {94} [color=green];
     120 -> {121};
     121 -> {122};
     122 -> {123};
-    123 -> {106};
-    124 -> {126};
+    123 -> {124};
+    124 -> {125};
+    125 -> {126};
     126 -> {127};
     127 -> {128};
     128 -> {129};
-    129 -> {125};
-    130 -> {132};
+    129 -> {130};
+    130 -> {100} [color=red];
+    130 -> {98} [color=green];
+
+    subgraph cluster_26 {
+        color=red
+        131 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_27 {
+            color=blue
+            132 [label="Enter block"];
+            133 [label="Postponed enter to lambda"];
+            subgraph cluster_28 {
+                color=blue
+                152 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_29 {
+                    color=blue
+                    153 [label="Enter block"];
+                    154 [label="Access variable R|<local>/y|"];
+                    155 [label="Function call: R|<local>/y|.<Unresolved name: inc>#()"];
+                    156 [label="Access variable R|<local>/x|"];
+                    157 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
+                    158 [label="Exit block"];
+                }
+                159 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            134 [label="Postponed exit from lambda"];
+            135 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
+            136 [label="Function call: R|/id|<R|kotlin/Int|>(...)"];
+            137 [label="Access variable R|<local>/y|"];
+            138 [label="Type operator: (R|<local>/y| as R|kotlin/Int|)"];
+            139 [label="Postponed enter to lambda"];
+            subgraph cluster_30 {
+                color=blue
+                160 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_31 {
+                    color=blue
+                    161 [label="Enter block"];
+                    162 [label="Access variable R|<local>/x|"];
+                    163 [label="Function call: R|<local>/x|.<Unresolved name: inc>#()"];
+                    164 [label="Access variable R|<local>/y|"];
+                    165 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
+                    166 [label="Const: Int(1)"];
+                    167 [label="Exit block"];
+                }
+                168 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            140 [label="Postponed exit from lambda"];
+            141 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
+            142 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
+            143 [label="Variable declaration: lval a: R|kotlin/Int|"];
+            144 [label="Access variable R|<local>/x|"];
+            145 [label="Function call: <Inapplicable(INAPPLICABLE): [/takeInt]>#(...)"];
+            146 [label="Access variable R|<local>/y|"];
+            147 [label="Function call: R|/takeInt|(...)"];
+            148 [label="Access variable R|<local>/a|"];
+            149 [label="Function call: R|/takeInt|(...)"];
+            150 [label="Exit block"];
+        }
+        151 [label="Exit function test_4" style="filled" fillcolor=red];
+    }
+    131 -> {132};
     132 -> {133};
-    133 -> {134};
+    133 -> {134 152};
     134 -> {135};
     135 -> {136};
-    136 -> {131};
-
-    subgraph cluster_16 {
-        color=red
-        137 [label="Enter function test_5" style="filled" fillcolor=red];
-        139 [label="Postponed enter to lambda"];
-        subgraph cluster_17 {
-            color=blue
-            150 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            152 [label="Function call: R|/materialize|<R|kotlin/Int|>()"];
-            151 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-        }
-        140 [label="Postponed exit from lambda"];
-        141 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
-        142 [label="Postponed enter to lambda"];
-        subgraph cluster_18 {
-            color=blue
-            153 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            155 [label="Function call: R|/materialize|<R|kotlin/Int|>()"];
-            154 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-        }
-        143 [label="Postponed exit from lambda"];
-        144 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
-        146 [label="Call arguments union" style="filled" fillcolor=yellow];
-        145 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
-        147 [label="Variable declaration: lval x: R|kotlin/Int|"];
-        148 [label="Access variable R|<local>/x|"];
-        149 [label="Function call: R|/takeInt|(...)"];
-        138 [label="Exit function test_5" style="filled" fillcolor=red];
-    }
-    137 -> {139};
-    139 -> {150};
-    139 -> {140} [color=red];
+    136 -> {137};
+    137 -> {138};
+    138 -> {139};
+    139 -> {140 160};
     140 -> {141};
     141 -> {142};
-    142 -> {153};
-    142 -> {143} [color=red];
+    142 -> {143};
     143 -> {144};
-    144 -> {146};
-    145 -> {147};
-    146 -> {145};
+    144 -> {145};
+    145 -> {146};
+    146 -> {147};
     147 -> {148};
     148 -> {149};
-    149 -> {138};
-    150 -> {152};
-    151 -> {140} [color=green];
-    151 -> {146} [color=red];
-    152 -> {151};
-    153 -> {155};
-    154 -> {143} [color=green];
-    154 -> {146} [color=red];
-    155 -> {154};
-
-    subgraph cluster_19 {
-        color=red
-        156 [label="Enter function test_6" style="filled" fillcolor=red];
-        158 [label="Postponed enter to lambda"];
-        subgraph cluster_20 {
-            color=blue
-            163 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            165 [label="Postponed enter to lambda"];
-            subgraph cluster_21 {
-                color=blue
-                168 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                170 [label="Function call: R|/materialize|<R|kotlin/String|>()"];
-                169 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-            }
-            166 [label="Postponed exit from lambda"];
-            167 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)"];
-            164 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-        }
-        159 [label="Postponed exit from lambda"];
-        160 [label="Function call: R|/myRun|<R|kotlin/String|>(...)"];
-        161 [label="Function call: R|/id|<R|kotlin/String|>(...)"];
-        162 [label="Variable declaration: lval x: R|kotlin/String|"];
-        157 [label="Exit function test_6" style="filled" fillcolor=red];
-    }
-    156 -> {158};
+    149 -> {150};
+    150 -> {151};
+    152 -> {153};
+    153 -> {154};
+    154 -> {155};
+    155 -> {156};
+    156 -> {157};
+    157 -> {158};
     158 -> {159};
-    158 -> {163} [color=red];
-    159 -> {160};
     160 -> {161};
     161 -> {162};
-    162 -> {157};
-    163 -> {165};
-    165 -> {168};
-    165 -> {166} [color=red];
+    162 -> {163};
+    163 -> {164};
+    164 -> {165};
+    165 -> {166};
     166 -> {167};
-    167 -> {164};
-    168 -> {170};
-    169 -> {166} [color=green];
-    170 -> {169};
+    167 -> {168};
+
+    subgraph cluster_32 {
+        color=red
+        169 [label="Enter function test_5" style="filled" fillcolor=red];
+        subgraph cluster_33 {
+            color=blue
+            170 [label="Enter block"];
+            171 [label="Postponed enter to lambda"];
+            subgraph cluster_34 {
+                color=blue
+                184 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_35 {
+                    color=blue
+                    185 [label="Enter block"];
+                    186 [label="Function call: R|/materialize|<R|kotlin/Int|>()"];
+                    187 [label="Exit block"];
+                }
+                188 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            172 [label="Postponed exit from lambda"];
+            173 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
+            174 [label="Postponed enter to lambda"];
+            subgraph cluster_36 {
+                color=blue
+                189 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_37 {
+                    color=blue
+                    190 [label="Enter block"];
+                    191 [label="Function call: R|/materialize|<R|kotlin/Int|>()"];
+                    192 [label="Exit block"];
+                }
+                193 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            175 [label="Postponed exit from lambda"];
+            176 [label="Function call: R|kotlin/run|<R|kotlin/Int|>(...)"];
+            177 [label="Call arguments union" style="filled" fillcolor=yellow];
+            178 [label="Function call: R|/select|<R|kotlin/Int|>(...)"];
+            179 [label="Variable declaration: lval x: R|kotlin/Int|"];
+            180 [label="Access variable R|<local>/x|"];
+            181 [label="Function call: R|/takeInt|(...)"];
+            182 [label="Exit block"];
+        }
+        183 [label="Exit function test_5" style="filled" fillcolor=red];
+    }
+    169 -> {170};
+    170 -> {171};
+    171 -> {184};
+    171 -> {172} [color=red];
+    172 -> {173};
+    173 -> {174};
+    174 -> {189};
+    174 -> {175} [color=red];
+    175 -> {176};
+    176 -> {177};
+    177 -> {178};
+    178 -> {179};
+    179 -> {180};
+    180 -> {181};
+    181 -> {182};
+    182 -> {183};
+    184 -> {185};
+    185 -> {186};
+    186 -> {187};
+    187 -> {188};
+    188 -> {177} [color=red];
+    188 -> {172} [color=green];
+    189 -> {190};
+    190 -> {191};
+    191 -> {192};
+    192 -> {193};
+    193 -> {177} [color=red];
+    193 -> {175} [color=green];
+
+    subgraph cluster_38 {
+        color=red
+        194 [label="Enter function test_6" style="filled" fillcolor=red];
+        subgraph cluster_39 {
+            color=blue
+            195 [label="Enter block"];
+            196 [label="Postponed enter to lambda"];
+            subgraph cluster_40 {
+                color=blue
+                203 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_41 {
+                    color=blue
+                    204 [label="Enter block"];
+                    205 [label="Postponed enter to lambda"];
+                    subgraph cluster_42 {
+                        color=blue
+                        210 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                        subgraph cluster_43 {
+                            color=blue
+                            211 [label="Enter block"];
+                            212 [label="Function call: R|/materialize|<R|kotlin/String|>()"];
+                            213 [label="Exit block"];
+                        }
+                        214 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                    }
+                    206 [label="Postponed exit from lambda"];
+                    207 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)"];
+                    208 [label="Exit block"];
+                }
+                209 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            197 [label="Postponed exit from lambda"];
+            198 [label="Function call: R|/myRun|<R|kotlin/String|>(...)"];
+            199 [label="Function call: R|/id|<R|kotlin/String|>(...)"];
+            200 [label="Variable declaration: lval x: R|kotlin/String|"];
+            201 [label="Exit block"];
+        }
+        202 [label="Exit function test_6" style="filled" fillcolor=red];
+    }
+    194 -> {195};
+    195 -> {196};
+    196 -> {197 203};
+    197 -> {198};
+    198 -> {199};
+    199 -> {200};
+    200 -> {201};
+    201 -> {202};
+    203 -> {204};
+    204 -> {205};
+    205 -> {210};
+    205 -> {206} [color=red];
+    206 -> {207};
+    207 -> {208};
+    208 -> {209};
+    210 -> {211};
+    211 -> {212};
+    212 -> {213};
+    213 -> {214};
+    214 -> {206} [color=green];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/initBlock.dot

@@ -5,81 +5,81 @@ digraph initBlock_kt {
 
     subgraph cluster_0 {
         color=red
-        0 [label="Enter function <init>" style="filled" fillcolor=red];
-        2 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        1 [label="Exit function <init>" style="filled" fillcolor=red];
-    }
-    0 -> {2};
-    2 -> {1};
-
-    subgraph cluster_1 {
-        color=red
-        9 [label="Enter class Foo" style="filled" fillcolor=red];
-        subgraph cluster_2 {
+        0 [label="Enter class Foo" style="filled" fillcolor=red];
+        subgraph cluster_1 {
             color=blue
-            3 [label="Enter init block" style="filled" fillcolor=red];
-            subgraph cluster_3 {
+            2 [label="Enter init block" style="filled" fillcolor=red];
+            subgraph cluster_2 {
                 color=blue
-                5 [label="Enter block"];
-                6 [label="Const: Int(1)"];
-                7 [label="Variable declaration: lval x: R|kotlin/Int|"];
-                8 [label="Exit block"];
+                3 [label="Enter block"];
+                4 [label="Const: Int(1)"];
+                5 [label="Variable declaration: lval x: R|kotlin/Int|"];
+                6 [label="Exit block"];
             }
-            4 [label="Exit init block" style="filled" fillcolor=red];
+            7 [label="Exit init block" style="filled" fillcolor=red];
         }
-        10 [label="Exit class Foo" style="filled" fillcolor=red];
+        1 [label="Exit class Foo" style="filled" fillcolor=red];
     }
-    9 -> {3} [color=green];
-    3 -> {5};
-    4 -> {10} [color=green];
+    0 -> {2} [color=green];
+    2 -> {3};
+    3 -> {4};
+    4 -> {5};
     5 -> {6};
     6 -> {7};
-    7 -> {8};
-    8 -> {4};
+    7 -> {1} [color=green];
+
+    subgraph cluster_3 {
+        color=red
+        8 [label="Enter function <init>" style="filled" fillcolor=red];
+        9 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        10 [label="Exit function <init>" style="filled" fillcolor=red];
+    }
+    8 -> {9};
+    9 -> {10};
 
     subgraph cluster_4 {
         color=red
-        11 [label="Enter function <init>" style="filled" fillcolor=red];
-        13 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        12 [label="Exit function <init>" style="filled" fillcolor=red];
-    }
-    11 -> {13};
-    13 -> {12};
-
-    subgraph cluster_5 {
-        color=red
-        25 [label="Enter class Bar" style="filled" fillcolor=red];
-        subgraph cluster_6 {
+        11 [label="Enter class Bar" style="filled" fillcolor=red];
+        subgraph cluster_5 {
             color=blue
-            14 [label="Enter init block" style="filled" fillcolor=red];
-            subgraph cluster_7 {
+            13 [label="Enter init block" style="filled" fillcolor=red];
+            subgraph cluster_6 {
                 color=blue
-                16 [label="Enter block"];
-                17 [label="Const: Int(1)"];
-                18 [label="Variable declaration: lval x: R|kotlin/Int|"];
-                19 [label="Function call: R|java/lang/Exception.Exception|()"];
-                20 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                21 [label="Stub" style="filled" fillcolor=gray];
-                22 [label="Const: Int(2)" style="filled" fillcolor=gray];
-                23 [label="Variable declaration: lval y: R|kotlin/Int|" style="filled" fillcolor=gray];
-                24 [label="Exit block" style="filled" fillcolor=gray];
+                14 [label="Enter block"];
+                15 [label="Const: Int(1)"];
+                16 [label="Variable declaration: lval x: R|kotlin/Int|"];
+                17 [label="Function call: R|java/lang/Exception.Exception|()"];
+                18 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                19 [label="Stub" style="filled" fillcolor=gray];
+                20 [label="Const: Int(2)" style="filled" fillcolor=gray];
+                21 [label="Variable declaration: lval y: R|kotlin/Int|" style="filled" fillcolor=gray];
+                22 [label="Exit block" style="filled" fillcolor=gray];
             }
-            15 [label="Exit init block" style="filled" fillcolor=red];
+            23 [label="Exit init block" style="filled" fillcolor=red];
         }
-        26 [label="Exit class Bar" style="filled" fillcolor=red];
+        12 [label="Exit class Bar" style="filled" fillcolor=red];
     }
-    25 -> {14} [color=green];
-    14 -> {16};
-    15 -> {26} [color=green];
+    11 -> {13} [color=green];
+    13 -> {14};
+    14 -> {15};
+    15 -> {16};
     16 -> {17};
     17 -> {18};
-    18 -> {19};
-    19 -> {20};
-    20 -> {15};
+    18 -> {23};
+    18 -> {19} [style=dotted];
+    19 -> {20} [style=dotted];
     20 -> {21} [style=dotted];
     21 -> {22} [style=dotted];
     22 -> {23} [style=dotted];
-    23 -> {24} [style=dotted];
-    24 -> {15} [style=dotted];
+    23 -> {12} [color=green];
+
+    subgraph cluster_7 {
+        color=red
+        24 [label="Enter function <init>" style="filled" fillcolor=red];
+        25 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        26 [label="Exit function <init>" style="filled" fillcolor=red];
+    }
+    24 -> {25};
+    25 -> {26};
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.dot

@@ -12,85 +12,86 @@ digraph initBlockAndInPlaceLambda_kt {
 
     subgraph cluster_1 {
         color=red
-        6 [label="Enter class A" style="filled" fillcolor=red];
-        subgraph cluster_2 {
-            color=blue
-            2 [label="Enter function getter" style="filled" fillcolor=red];
-            3 [label="Exit function getter" style="filled" fillcolor=red];
-        }
-        subgraph cluster_3 {
-            color=blue
-            4 [label="Enter property" style="filled" fillcolor=red];
-            5 [label="Exit property" style="filled" fillcolor=red];
-        }
-        7 [label="Exit class A" style="filled" fillcolor=red];
+        2 [label="Enter class A" style="filled" fillcolor=red];
+        3 [label="Exit class A" style="filled" fillcolor=red];
+    }
+    2 -> {3} [color=green];
+
+    subgraph cluster_2 {
+        color=red
+        4 [label="Enter function getter" style="filled" fillcolor=red];
+        5 [label="Exit function getter" style="filled" fillcolor=red];
     }
-    6 -> {4} [color=green];
     4 -> {5};
-    5 -> {7} [color=green];
-    2 -> {3};
 
-    subgraph cluster_4 {
+    subgraph cluster_3 {
         color=red
-        8 [label="Enter function <init>" style="filled" fillcolor=red];
-        10 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        9 [label="Exit function <init>" style="filled" fillcolor=red];
-    }
-    8 -> {10};
-    10 -> {9};
-
-    subgraph cluster_5 {
-        color=red
-        29 [label="Enter class C" style="filled" fillcolor=red];
-        subgraph cluster_6 {
+        6 [label="Enter class C" style="filled" fillcolor=red];
+        subgraph cluster_4 {
             color=blue
-            16 [label="Enter init block" style="filled" fillcolor=red];
-            subgraph cluster_7 {
+            8 [label="Enter init block" style="filled" fillcolor=red];
+            subgraph cluster_5 {
                 color=blue
-                18 [label="Enter block"];
-                19 [label="Access variable R|<local>/a|"];
-                20 [label="Access variable R|/A.b|"];
-                21 [label="Enter safe call"];
-                23 [label="Postponed enter to lambda"];
-                subgraph cluster_8 {
+                9 [label="Enter block"];
+                10 [label="Access variable R|<local>/a|"];
+                11 [label="Access variable R|/A.b|"];
+                12 [label="Enter safe call"];
+                13 [label="Postponed enter to lambda"];
+                subgraph cluster_6 {
                     color=blue
-                    11 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                    13 [label="Access variable R|<local>/a|"];
-                    14 [label="Access variable R|<local>/it|"];
-                    15 [label="Function call: R|/C.C|(...)"];
-                    12 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                    21 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                    subgraph cluster_7 {
+                        color=blue
+                        22 [label="Enter block"];
+                        23 [label="Access variable R|<local>/a|"];
+                        24 [label="Access variable R|<local>/it|"];
+                        25 [label="Function call: R|/C.C|(...)"];
+                        26 [label="Exit block"];
+                    }
+                    27 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
                 }
-                26 [label="Call arguments union" style="filled" fillcolor=yellow];
-                24 [label="Postponed exit from lambda"];
-                25 [label="Function call: $subj$.R|kotlin/let|<R|B|, R|C|>(...)"];
-                22 [label="Exit safe call"];
-                27 [label="Variable declaration: lval c: R|C?|"];
-                28 [label="Exit block"];
+                14 [label="Call arguments union" style="filled" fillcolor=yellow];
+                15 [label="Postponed exit from lambda"];
+                16 [label="Function call: $subj$.R|kotlin/let|<R|B|, R|C|>(...)"];
+                17 [label="Exit safe call"];
+                18 [label="Variable declaration: lval c: R|C?|"];
+                19 [label="Exit block"];
             }
-            17 [label="Exit init block" style="filled" fillcolor=red];
+            20 [label="Exit init block" style="filled" fillcolor=red];
         }
-        30 [label="Exit class C" style="filled" fillcolor=red];
+        7 [label="Exit class C" style="filled" fillcolor=red];
     }
-    29 -> {16} [color=green];
-    16 -> {18};
-    17 -> {30} [color=green];
+    6 -> {8} [color=green];
+    8 -> {9};
+    9 -> {10};
+    10 -> {11};
+    11 -> {12 17};
+    12 -> {13};
+    13 -> {21};
+    13 -> {15} [color=red];
+    14 -> {16} [color=red];
+    15 -> {16} [color=green];
+    16 -> {17};
+    17 -> {18};
     18 -> {19};
     19 -> {20};
-    20 -> {21 22};
-    21 -> {23};
-    22 -> {27};
-    23 -> {11};
-    23 -> {24} [color=red];
-    24 -> {25} [color=green];
-    25 -> {22};
-    26 -> {25} [color=red];
-    27 -> {28};
-    28 -> {17};
-    11 -> {13};
-    12 -> {24} [color=green];
-    12 -> {26} [color=red];
-    13 -> {14};
-    14 -> {15};
-    15 -> {12};
+    20 -> {7} [color=green];
+    21 -> {22};
+    22 -> {23};
+    23 -> {24};
+    24 -> {25};
+    25 -> {26};
+    26 -> {27};
+    27 -> {14} [color=red];
+    27 -> {15} [color=green];
+
+    subgraph cluster_8 {
+        color=red
+        28 [label="Enter function <init>" style="filled" fillcolor=red];
+        29 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        30 [label="Exit function <init>" style="filled" fillcolor=red];
+    }
+    28 -> {29};
+    29 -> {30};
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/innerClassInAnonymousObject.dot

@@ -0,0 +1,68 @@
+digraph innerClassInAnonymousObject_kt {
+    graph [nodesep=3]
+    node [shape=box penwidth=2]
+    edge [penwidth=2]
+
+    subgraph cluster_0 {
+        color=red
+        0 [label="Enter function <init>" style="filled" fillcolor=red];
+        1 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        2 [label="Exit function <init>" style="filled" fillcolor=red];
+    }
+    0 -> {1};
+    1 -> {2};
+
+    subgraph cluster_1 {
+        color=red
+        3 [label="Enter class Nested" style="filled" fillcolor=red];
+        4 [label="Exit class Nested" style="filled" fillcolor=red];
+    }
+    3 -> {4} [color=green];
+
+    subgraph cluster_2 {
+        color=red
+        5 [label="Enter function <init>" style="filled" fillcolor=red];
+        6 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        7 [label="Exit function <init>" style="filled" fillcolor=red];
+    }
+    5 -> {6};
+    6 -> {7};
+
+    subgraph cluster_3 {
+        color=red
+        8 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_4 {
+            color=blue
+            9 [label="Enter block"];
+            10 [label="Exit block"];
+        }
+        11 [label="Exit function foo" style="filled" fillcolor=red];
+    }
+    8 -> {9};
+    9 -> {10};
+    10 -> {11};
+
+    subgraph cluster_5 {
+        color=red
+        14 [label="Enter function getter" style="filled" fillcolor=red];
+        15 [label="Exit function getter" style="filled" fillcolor=red];
+    }
+    14 -> {15};
+
+    subgraph cluster_6 {
+        color=red
+        16 [label="Enter property" style="filled" fillcolor=red];
+        subgraph cluster_7 {
+            color=blue
+            12 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
+            13 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
+        }
+        17 [label="Exit anonymous object"];
+        18 [label="Exit property" style="filled" fillcolor=red];
+    }
+    16 -> {17};
+    16 -> {0 5 8} [color=red];
+    17 -> {18};
+    12 -> {13} [color=green];
+
+}

compiler/fir/analysis-tests/testData/resolve/cfg/innerClassInAnonymousObject.kt

@@ -0,0 +1,7 @@
+// !DUMP_CFG
+
+val x = object {
+    class Nested {
+        fun foo() {}
+    }
+}

compiler/fir/analysis-tests/testData/resolve/cfg/innerClassInAnonymousObject.txt

@@ -0,0 +1,19 @@
+FILE: innerClassInAnonymousObject.kt
+    public final val x: R|<anonymous>| = object : R|kotlin/Any| {
+        private[local] constructor(): R|<anonymous>| {
+            super<R|kotlin/Any|>()
+        }
+
+        local final class Nested : R|kotlin/Any| {
+            public[local] constructor(): R|<anonymous>.Nested| {
+                super<R|kotlin/Any|>()
+            }
+
+            public[local] final fun foo(): R|kotlin/Unit| {
+            }
+
+        }
+
+    }
+
+        public get(): R|<anonymous>|

compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.dot

@@ -6,187 +6,236 @@ digraph inplaceLambdaInControlFlowExpressions_kt {
     subgraph cluster_0 {
         color=red
         0 [label="Enter function materialize" style="filled" fillcolor=red];
-        2 [label="Const: Null(null)"];
-        3 [label="Check not null: Null(null)!!"];
-        4 [label="Jump: ^materialize Null(null)!!"];
-        5 [label="Stub" style="filled" fillcolor=gray];
-        1 [label="Exit function materialize" style="filled" fillcolor=red];
+        subgraph cluster_1 {
+            color=blue
+            1 [label="Enter block"];
+            2 [label="Const: Null(null)"];
+            3 [label="Check not null: Null(null)!!"];
+            4 [label="Jump: ^materialize Null(null)!!"];
+            5 [label="Stub" style="filled" fillcolor=gray];
+            6 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        7 [label="Exit function materialize" style="filled" fillcolor=red];
     }
-    0 -> {2};
+    0 -> {1};
+    1 -> {2};
     2 -> {3};
     3 -> {4};
-    4 -> {1};
+    4 -> {7};
     4 -> {5} [style=dotted];
-    5 -> {1} [style=dotted];
+    5 -> {6} [style=dotted];
+    6 -> {7} [style=dotted];
 
-    subgraph cluster_1 {
+    subgraph cluster_2 {
         color=red
-        6 [label="Enter function test_1" style="filled" fillcolor=red];
-        subgraph cluster_2 {
+        8 [label="Enter function test_1" style="filled" fillcolor=red];
+        subgraph cluster_3 {
             color=blue
-            8 [label="Enter when"];
-            subgraph cluster_3 {
-                color=blue
-                10 [label="Enter when branch condition "];
-                11 [label="Const: Boolean(true)"];
-                12 [label="Exit when branch condition"];
-            }
+            9 [label="Enter block"];
             subgraph cluster_4 {
                 color=blue
-                20 [label="Enter when branch condition else"];
-                21 [label="Exit when branch condition"];
-            }
-            22 [label="Enter when branch result"];
-            subgraph cluster_5 {
-                color=blue
-                23 [label="Enter block"];
-                24 [label="Const: String()"];
-                25 [label="Exit block"];
-            }
-            26 [label="Exit when branch result"];
-            13 [label="Enter when branch result"];
-            subgraph cluster_6 {
-                color=blue
-                14 [label="Enter block"];
-                15 [label="Postponed enter to lambda"];
+                10 [label="Enter when"];
+                subgraph cluster_5 {
+                    color=blue
+                    11 [label="Enter when branch condition "];
+                    12 [label="Const: Boolean(true)"];
+                    13 [label="Exit when branch condition"];
+                }
+                subgraph cluster_6 {
+                    color=blue
+                    14 [label="Enter when branch condition else"];
+                    15 [label="Exit when branch condition"];
+                }
+                16 [label="Enter when branch result"];
                 subgraph cluster_7 {
                     color=blue
-                    29 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                    31 [label="Function call: R|/materialize|<R|kotlin/String|>()"];
-                    30 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                    17 [label="Enter block"];
+                    18 [label="Const: String()"];
+                    19 [label="Exit block"];
                 }
-                16 [label="Postponed exit from lambda"];
-                17 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)"];
-                18 [label="Exit block"];
+                20 [label="Exit when branch result"];
+                21 [label="Enter when branch result"];
+                subgraph cluster_8 {
+                    color=blue
+                    22 [label="Enter block"];
+                    23 [label="Postponed enter to lambda"];
+                    subgraph cluster_9 {
+                        color=blue
+                        33 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                        subgraph cluster_10 {
+                            color=blue
+                            34 [label="Enter block"];
+                            35 [label="Function call: R|/materialize|<R|kotlin/String|>()"];
+                            36 [label="Exit block"];
+                        }
+                        37 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                    }
+                    24 [label="Postponed exit from lambda"];
+                    25 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)"];
+                    26 [label="Exit block"];
+                }
+                27 [label="Exit when branch result"];
+                28 [label="Exit when"];
             }
-            19 [label="Exit when branch result"];
-            9 [label="Exit when"];
+            29 [label="Call arguments union" style="filled" fillcolor=yellow];
+            30 [label="Variable declaration: lval x: R|kotlin/String|"];
+            31 [label="Exit block"];
         }
-        27 [label="Call arguments union" style="filled" fillcolor=yellow];
-        28 [label="Variable declaration: lval x: R|kotlin/String|"];
-        7 [label="Exit function test_1" style="filled" fillcolor=red];
+        32 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    6 -> {8};
-    8 -> {10};
-    9 -> {27};
+    8 -> {9};
+    9 -> {10};
     10 -> {11};
     11 -> {12};
-    12 -> {13 20};
-    13 -> {14};
+    12 -> {13};
+    13 -> {21 14};
     14 -> {15};
-    15 -> {29};
-    15 -> {16} [color=red];
+    15 -> {16};
     16 -> {17};
     17 -> {18};
     18 -> {19};
-    19 -> {9};
-    20 -> {21};
+    19 -> {20};
+    20 -> {28};
     21 -> {22};
     22 -> {23};
-    23 -> {24};
+    23 -> {33};
+    23 -> {24} [color=red];
     24 -> {25};
     25 -> {26};
-    26 -> {9};
+    26 -> {27};
     27 -> {28};
-    28 -> {7};
-    29 -> {31};
-    30 -> {16} [color=green];
-    30 -> {27} [color=red];
-    31 -> {30};
+    28 -> {29};
+    29 -> {30};
+    30 -> {31};
+    31 -> {32};
+    33 -> {34};
+    34 -> {35};
+    35 -> {36};
+    36 -> {37};
+    37 -> {29} [color=red];
+    37 -> {24} [color=green];
 
-    subgraph cluster_8 {
+    subgraph cluster_11 {
         color=red
-        32 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_9 {
+        38 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_12 {
             color=blue
-            34 [label="Try expression enter"];
-            subgraph cluster_10 {
-                color=blue
-                36 [label="Try main block enter"];
-                subgraph cluster_11 {
-                    color=blue
-                    38 [label="Enter block"];
-                    39 [label="Postponed enter to lambda"];
-                    subgraph cluster_12 {
-                        color=blue
-                        50 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                        52 [label="Function call: R|/materialize|<R|kotlin/String|>()"];
-                        51 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-                    }
-                    40 [label="Postponed exit from lambda"];
-                    41 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)"];
-                    42 [label="Exit block"];
-                }
-                43 [label="Try main block exit"];
-            }
+            39 [label="Enter block"];
             subgraph cluster_13 {
                 color=blue
-                37 [label="Catch enter"];
+                40 [label="Try expression enter"];
                 subgraph cluster_14 {
                     color=blue
-                    44 [label="Enter block"];
-                    45 [label="Const: String()"];
-                    46 [label="Exit block"];
+                    41 [label="Try main block enter"];
+                    subgraph cluster_15 {
+                        color=blue
+                        42 [label="Enter block"];
+                        43 [label="Postponed enter to lambda"];
+                        subgraph cluster_16 {
+                            color=blue
+                            58 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                            subgraph cluster_17 {
+                                color=blue
+                                59 [label="Enter block"];
+                                60 [label="Function call: R|/materialize|<R|kotlin/String|>()"];
+                                61 [label="Exit block"];
+                            }
+                            62 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                        }
+                        44 [label="Postponed exit from lambda"];
+                        45 [label="Function call: R|kotlin/run|<R|kotlin/String|>(...)"];
+                        46 [label="Exit block"];
+                    }
+                    47 [label="Try main block exit"];
                 }
-                47 [label="Catch exit"];
+                subgraph cluster_18 {
+                    color=blue
+                    48 [label="Catch enter"];
+                    subgraph cluster_19 {
+                        color=blue
+                        49 [label="Enter block"];
+                        50 [label="Const: String()"];
+                        51 [label="Exit block"];
+                    }
+                    52 [label="Catch exit"];
+                }
+                53 [label="Try expression exit"];
             }
-            35 [label="Try expression exit"];
+            54 [label="Call arguments union" style="filled" fillcolor=yellow];
+            55 [label="Variable declaration: lval x: R|kotlin/String|"];
+            56 [label="Exit block"];
         }
-        48 [label="Call arguments union" style="filled" fillcolor=yellow];
-        49 [label="Variable declaration: lval x: R|kotlin/String|"];
-        33 [label="Exit function test_2" style="filled" fillcolor=red];
+        57 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    32 -> {34};
-    34 -> {36};
-    35 -> {48};
-    36 -> {33 37 38};
-    37 -> {33 44};
     38 -> {39};
-    39 -> {50};
-    39 -> {40} [color=red];
+    39 -> {40};
     40 -> {41};
-    41 -> {42};
+    41 -> {57 48 42};
     42 -> {43};
-    43 -> {35};
+    43 -> {58};
+    43 -> {44} [color=red];
     44 -> {45};
     45 -> {46};
     46 -> {47};
-    47 -> {35};
-    48 -> {49};
-    49 -> {33};
-    50 -> {52};
-    51 -> {40} [color=green];
-    51 -> {48} [color=red];
-    52 -> {51};
-
-    subgraph cluster_15 {
-        color=red
-        53 [label="Enter function test_3" style="filled" fillcolor=red];
-        55 [label="Postponed enter to lambda"];
-        subgraph cluster_16 {
-            color=blue
-            61 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            63 [label="Function call: R|/materialize|<R|kotlin/String?|>()"];
-            62 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-        }
-        56 [label="Postponed exit from lambda"];
-        57 [label="Function call: R|kotlin/run|<R|kotlin/String?|>(...)"];
-        58 [label="Check not null: R|kotlin/run|<R|kotlin/String?|>(...)!!"];
-        59 [label="Call arguments union" style="filled" fillcolor=yellow];
-        60 [label="Variable declaration: lval x: R|kotlin/String|"];
-        54 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
-    53 -> {55};
-    55 -> {61};
-    55 -> {56} [color=red];
+    47 -> {53};
+    48 -> {57 49};
+    49 -> {50};
+    50 -> {51};
+    51 -> {52};
+    52 -> {53};
+    53 -> {54};
+    54 -> {55};
+    55 -> {56};
     56 -> {57};
-    57 -> {58};
     58 -> {59};
     59 -> {60};
-    60 -> {54};
-    61 -> {63};
-    62 -> {56} [color=green];
-    62 -> {59} [color=red];
-    63 -> {62};
+    60 -> {61};
+    61 -> {62};
+    62 -> {54} [color=red];
+    62 -> {44} [color=green];
+
+    subgraph cluster_20 {
+        color=red
+        63 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_21 {
+            color=blue
+            64 [label="Enter block"];
+            65 [label="Postponed enter to lambda"];
+            subgraph cluster_22 {
+                color=blue
+                73 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_23 {
+                    color=blue
+                    74 [label="Enter block"];
+                    75 [label="Function call: R|/materialize|<R|kotlin/String?|>()"];
+                    76 [label="Exit block"];
+                }
+                77 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            66 [label="Postponed exit from lambda"];
+            67 [label="Function call: R|kotlin/run|<R|kotlin/String?|>(...)"];
+            68 [label="Check not null: R|kotlin/run|<R|kotlin/String?|>(...)!!"];
+            69 [label="Call arguments union" style="filled" fillcolor=yellow];
+            70 [label="Variable declaration: lval x: R|kotlin/String|"];
+            71 [label="Exit block"];
+        }
+        72 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
+    63 -> {64};
+    64 -> {65};
+    65 -> {73};
+    65 -> {66} [color=red];
+    66 -> {67};
+    67 -> {68};
+    68 -> {69};
+    69 -> {70};
+    70 -> {71};
+    71 -> {72};
+    73 -> {74};
+    74 -> {75};
+    75 -> {76};
+    76 -> {77};
+    77 -> {69} [color=red];
+    77 -> {66} [color=green];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/jumps.dot

@@ -8,348 +8,405 @@ digraph jumps_kt {
         0 [label="Enter function test_1" style="filled" fillcolor=red];
         subgraph cluster_1 {
             color=blue
-            2 [label="Enter when"];
+            1 [label="Enter block"];
             subgraph cluster_2 {
                 color=blue
-                4 [label="Enter when branch condition "];
-                5 [label="Access variable R|<local>/x|"];
-                6 [label="Const: Null(null)"];
-                7 [label="Operator =="];
-                8 [label="Exit when branch condition"];
+                2 [label="Enter when"];
+                subgraph cluster_3 {
+                    color=blue
+                    3 [label="Enter when branch condition "];
+                    4 [label="Access variable R|<local>/x|"];
+                    5 [label="Const: Null(null)"];
+                    6 [label="Operator =="];
+                    7 [label="Exit when branch condition"];
+                }
+                subgraph cluster_4 {
+                    color=blue
+                    8 [label="Enter when branch condition else"];
+                    9 [label="Exit when branch condition"];
+                }
+                10 [label="Enter when branch result"];
+                subgraph cluster_5 {
+                    color=blue
+                    11 [label="Enter block"];
+                    12 [label="Access variable R|<local>/x|"];
+                    13 [label="Exit block"];
+                }
+                14 [label="Exit when branch result"];
+                15 [label="Enter when branch result"];
+                subgraph cluster_6 {
+                    color=blue
+                    16 [label="Enter block"];
+                    17 [label="Function call: R|java/lang/Exception.Exception|()"];
+                    18 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                    19 [label="Stub" style="filled" fillcolor=gray];
+                    20 [label="Exit block" style="filled" fillcolor=gray];
+                }
+                21 [label="Exit when branch result" style="filled" fillcolor=gray];
+                22 [label="Exit when"];
             }
-            subgraph cluster_3 {
-                color=blue
-                16 [label="Enter when branch condition else"];
-                17 [label="Exit when branch condition"];
-            }
-            18 [label="Enter when branch result"];
-            subgraph cluster_4 {
-                color=blue
-                19 [label="Enter block"];
-                20 [label="Access variable R|<local>/x|"];
-                21 [label="Exit block"];
-            }
-            22 [label="Exit when branch result"];
-            9 [label="Enter when branch result"];
-            subgraph cluster_5 {
-                color=blue
-                10 [label="Enter block"];
-                11 [label="Function call: R|java/lang/Exception.Exception|()"];
-                12 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                13 [label="Stub" style="filled" fillcolor=gray];
-                14 [label="Exit block" style="filled" fillcolor=gray];
-            }
-            15 [label="Exit when branch result" style="filled" fillcolor=gray];
-            3 [label="Exit when"];
+            23 [label="Variable declaration: lval y: R|kotlin/Int|"];
+            24 [label="Access variable R|<local>/y|"];
+            25 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
+            26 [label="Access variable R|<local>/x|"];
+            27 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+            28 [label="Exit block"];
         }
-        23 [label="Variable declaration: lval y: R|kotlin/Int|"];
-        24 [label="Access variable R|<local>/y|"];
-        25 [label="Function call: R|<local>/y|.R|kotlin/Int.inc|()"];
-        26 [label="Access variable R|<local>/x|"];
-        27 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
-        1 [label="Exit function test_1" style="filled" fillcolor=red];
+        29 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    0 -> {2};
-    2 -> {4};
-    3 -> {23};
+    0 -> {1};
+    1 -> {2};
+    2 -> {3};
+    3 -> {4};
     4 -> {5};
     5 -> {6};
     6 -> {7};
-    7 -> {8};
-    8 -> {9 16};
+    7 -> {15 8};
+    8 -> {9};
     9 -> {10};
     10 -> {11};
     11 -> {12};
-    12 -> {1};
-    12 -> {13} [style=dotted];
-    13 -> {14} [style=dotted];
-    14 -> {15} [style=dotted];
-    15 -> {3} [style=dotted];
+    12 -> {13};
+    13 -> {14};
+    14 -> {22};
+    15 -> {16};
     16 -> {17};
     17 -> {18};
-    18 -> {19};
-    19 -> {20};
-    20 -> {21};
-    21 -> {22};
-    22 -> {3};
+    18 -> {29};
+    18 -> {19} [style=dotted];
+    19 -> {20} [style=dotted];
+    20 -> {21} [style=dotted];
+    21 -> {22} [style=dotted];
+    22 -> {23};
     23 -> {24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
-    27 -> {1};
+    27 -> {28};
+    28 -> {29};
 
-    subgraph cluster_6 {
+    subgraph cluster_7 {
         color=red
-        28 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_7 {
+        30 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_8 {
             color=blue
-            30 [label="Enter when"];
-            subgraph cluster_8 {
-                color=blue
-                32 [label="Enter when branch condition "];
-                33 [label="Access variable R|<local>/x|"];
-                34 [label="Const: Null(null)"];
-                35 [label="Operator =="];
-                36 [label="Exit when branch condition"];
-            }
+            31 [label="Enter block"];
             subgraph cluster_9 {
                 color=blue
-                42 [label="Enter when branch condition else"];
-                43 [label="Exit when branch condition"];
+                32 [label="Enter when"];
+                subgraph cluster_10 {
+                    color=blue
+                    33 [label="Enter when branch condition "];
+                    34 [label="Access variable R|<local>/x|"];
+                    35 [label="Const: Null(null)"];
+                    36 [label="Operator =="];
+                    37 [label="Exit when branch condition"];
+                }
+                subgraph cluster_11 {
+                    color=blue
+                    38 [label="Enter when branch condition else"];
+                    39 [label="Exit when branch condition"];
+                }
+                40 [label="Enter when branch result"];
+                subgraph cluster_12 {
+                    color=blue
+                    41 [label="Enter block"];
+                    42 [label="Access variable R|<local>/x|"];
+                    43 [label="Exit block"];
+                }
+                44 [label="Exit when branch result"];
+                45 [label="Enter when branch result"];
+                subgraph cluster_13 {
+                    color=blue
+                    46 [label="Enter block"];
+                    47 [label="Access variable R|<local>/x|"];
+                    48 [label="Exit block"];
+                }
+                49 [label="Exit when branch result"];
+                50 [label="Exit when"];
             }
-            44 [label="Enter when branch result"];
-            subgraph cluster_10 {
-                color=blue
-                45 [label="Enter block"];
-                46 [label="Access variable R|<local>/x|"];
-                47 [label="Exit block"];
-            }
-            48 [label="Exit when branch result"];
-            37 [label="Enter when branch result"];
-            subgraph cluster_11 {
-                color=blue
-                38 [label="Enter block"];
-                39 [label="Access variable R|<local>/x|"];
-                40 [label="Exit block"];
-            }
-            41 [label="Exit when branch result"];
-            31 [label="Exit when"];
+            51 [label="Variable declaration: lval y: R|kotlin/Int?|"];
+            52 [label="Access variable R|<local>/y|"];
+            53 [label="Function call: R|<local>/y|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
+            54 [label="Exit block"];
         }
-        49 [label="Variable declaration: lval y: R|kotlin/Int?|"];
-        50 [label="Access variable R|<local>/y|"];
-        51 [label="Function call: R|<local>/y|.<Inapplicable(WRONG_RECEIVER): [kotlin/Int.inc]>#()"];
-        29 [label="Exit function test_2" style="filled" fillcolor=red];
+        55 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    28 -> {30};
-    30 -> {32};
-    31 -> {49};
+    30 -> {31};
+    31 -> {32};
     32 -> {33};
     33 -> {34};
     34 -> {35};
     35 -> {36};
-    36 -> {37 42};
-    37 -> {38};
+    36 -> {37};
+    37 -> {45 38};
     38 -> {39};
     39 -> {40};
     40 -> {41};
-    41 -> {31};
+    41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {45};
+    44 -> {50};
     45 -> {46};
     46 -> {47};
     47 -> {48};
-    48 -> {31};
+    48 -> {49};
     49 -> {50};
     50 -> {51};
-    51 -> {29};
+    51 -> {52};
+    52 -> {53};
+    53 -> {54};
+    54 -> {55};
 
-    subgraph cluster_12 {
+    subgraph cluster_14 {
         color=red
-        52 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_13 {
+        56 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_15 {
             color=blue
-            54 [label="Enter while loop"];
-            subgraph cluster_14 {
+            57 [label="Enter block"];
+            subgraph cluster_16 {
                 color=blue
-                56 [label="Enter loop condition"];
-                57 [label="Const: Boolean(true)"];
-                58 [label="Exit loop condition"];
-            }
-            subgraph cluster_15 {
-                color=blue
-                59 [label="Enter loop block"];
-                subgraph cluster_16 {
+                58 [label="Enter while loop"];
+                subgraph cluster_17 {
                     color=blue
-                    60 [label="Enter block"];
-                    61 [label="Access variable R|<local>/x|"];
-                    62 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
-                    63 [label="Jump: break@@@[Boolean(true)] "];
-                    64 [label="Stub" style="filled" fillcolor=gray];
-                    65 [label="Exit block" style="filled" fillcolor=gray];
+                    59 [label="Enter loop condition"];
+                    60 [label="Const: Boolean(true)"];
+                    61 [label="Exit loop condition"];
                 }
-                66 [label="Exit loop block" style="filled" fillcolor=gray];
+                subgraph cluster_18 {
+                    color=blue
+                    62 [label="Enter loop block"];
+                    subgraph cluster_19 {
+                        color=blue
+                        63 [label="Enter block"];
+                        64 [label="Access variable R|<local>/x|"];
+                        65 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
+                        66 [label="Jump: break@@@[Boolean(true)] "];
+                        67 [label="Stub" style="filled" fillcolor=gray];
+                        68 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    69 [label="Exit loop block" style="filled" fillcolor=gray];
+                }
+                70 [label="Exit whileloop"];
             }
-            55 [label="Exit whileloop"];
+            71 [label="Access variable R|<local>/x|"];
+            72 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+            73 [label="Exit block"];
         }
-        67 [label="Access variable R|<local>/x|"];
-        68 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
-        53 [label="Exit function test_3" style="filled" fillcolor=red];
+        74 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    52 -> {54};
-    54 -> {56};
-    55 -> {67};
     56 -> {57};
     57 -> {58};
     58 -> {59};
-    58 -> {55} [style=dotted];
     59 -> {60};
     60 -> {61};
     61 -> {62};
+    61 -> {70} [style=dotted];
     62 -> {63};
-    63 -> {55};
-    63 -> {64} [style=dotted];
-    64 -> {65} [style=dotted];
-    65 -> {66} [style=dotted];
-    66 -> {56} [style=dotted];
-    67 -> {68};
-    68 -> {53};
-
-    subgraph cluster_17 {
-        color=red
-        69 [label="Enter function test_4" style="filled" fillcolor=red];
-        subgraph cluster_18 {
-            color=blue
-            71 [label="Enter do-while loop"];
-            subgraph cluster_19 {
-                color=blue
-                73 [label="Enter loop block"];
-                subgraph cluster_20 {
-                    color=blue
-                    74 [label="Enter block"];
-                    75 [label="Access variable R|<local>/x|"];
-                    76 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
-                    77 [label="Jump: break@@@[Boolean(true)] "];
-                    78 [label="Stub" style="filled" fillcolor=gray];
-                    79 [label="Exit block" style="filled" fillcolor=gray];
-                }
-                80 [label="Exit loop block" style="filled" fillcolor=gray];
-            }
-            subgraph cluster_21 {
-                color=blue
-                81 [label="Enter loop condition" style="filled" fillcolor=gray];
-                82 [label="Const: Boolean(true)" style="filled" fillcolor=gray];
-                83 [label="Exit loop condition" style="filled" fillcolor=gray];
-            }
-            72 [label="Exit do-whileloop"];
-        }
-        84 [label="Access variable R|<local>/x|"];
-        85 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
-        70 [label="Exit function test_4" style="filled" fillcolor=red];
-    }
-    69 -> {71};
-    71 -> {73};
-    72 -> {84};
+    63 -> {64};
+    64 -> {65};
+    65 -> {66};
+    66 -> {70};
+    66 -> {67} [style=dotted];
+    67 -> {68} [style=dotted];
+    68 -> {69} [style=dotted];
+    69 -> {59} [color=green style=dotted];
+    70 -> {71};
+    71 -> {72};
+    72 -> {73};
     73 -> {74};
-    74 -> {75};
+
+    subgraph cluster_20 {
+        color=red
+        75 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_21 {
+            color=blue
+            76 [label="Enter block"];
+            subgraph cluster_22 {
+                color=blue
+                77 [label="Enter do-while loop"];
+                subgraph cluster_23 {
+                    color=blue
+                    78 [label="Enter loop block"];
+                    subgraph cluster_24 {
+                        color=blue
+                        79 [label="Enter block"];
+                        80 [label="Access variable R|<local>/x|"];
+                        81 [label="Type operator: (R|<local>/x| as R|kotlin/Int|)"];
+                        82 [label="Jump: break@@@[Boolean(true)] "];
+                        83 [label="Stub" style="filled" fillcolor=gray];
+                        84 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    85 [label="Exit loop block" style="filled" fillcolor=gray];
+                }
+                subgraph cluster_25 {
+                    color=blue
+                    86 [label="Enter loop condition" style="filled" fillcolor=gray];
+                    87 [label="Const: Boolean(true)" style="filled" fillcolor=gray];
+                    88 [label="Exit loop condition" style="filled" fillcolor=gray];
+                }
+                89 [label="Exit do-whileloop"];
+            }
+            90 [label="Access variable R|<local>/x|"];
+            91 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+            92 [label="Exit block"];
+        }
+        93 [label="Exit function test_4" style="filled" fillcolor=red];
+    }
     75 -> {76};
     76 -> {77};
-    77 -> {72};
-    77 -> {78} [style=dotted];
-    78 -> {79} [style=dotted];
-    79 -> {80} [style=dotted];
-    80 -> {81} [style=dotted];
-    81 -> {82} [style=dotted];
+    77 -> {78};
+    78 -> {79};
+    79 -> {80};
+    80 -> {81};
+    81 -> {82};
+    82 -> {89};
     82 -> {83} [style=dotted];
-    83 -> {73 72} [style=dotted];
-    84 -> {85};
-    85 -> {70};
-
-    subgraph cluster_22 {
-        color=red
-        86 [label="Enter function test_5" style="filled" fillcolor=red];
-        subgraph cluster_23 {
-            color=blue
-            88 [label="Enter while loop"];
-            subgraph cluster_24 {
-                color=blue
-                90 [label="Enter loop condition"];
-                91 [label="Access variable R|<local>/b|"];
-                92 [label="Exit loop condition"];
-            }
-            subgraph cluster_25 {
-                color=blue
-                93 [label="Enter loop block"];
-                subgraph cluster_26 {
-                    color=blue
-                    94 [label="Enter block"];
-                    subgraph cluster_27 {
-                        color=blue
-                        95 [label="Enter when"];
-                        subgraph cluster_28 {
-                            color=blue
-                            97 [label="Enter when branch condition "];
-                            98 [label="Access variable R|<local>/b|"];
-                            99 [label="Exit when branch condition"];
-                        }
-                        106 [label="Synthetic else branch"];
-                        100 [label="Enter when branch result"];
-                        subgraph cluster_29 {
-                            color=blue
-                            101 [label="Enter block"];
-                            102 [label="Jump: continue@@@[R|<local>/b|] "];
-                            103 [label="Stub" style="filled" fillcolor=gray];
-                            104 [label="Exit block" style="filled" fillcolor=gray];
-                        }
-                        105 [label="Exit when branch result" style="filled" fillcolor=gray];
-                        96 [label="Exit when"];
-                    }
-                    107 [label="Exit block"];
-                }
-                108 [label="Exit loop block"];
-            }
-            89 [label="Exit whileloop"];
-        }
-        87 [label="Exit function test_5" style="filled" fillcolor=red];
-    }
-    86 -> {88};
-    88 -> {90};
-    89 -> {87};
+    83 -> {84} [style=dotted];
+    84 -> {85} [style=dotted];
+    85 -> {86} [style=dotted];
+    86 -> {87} [style=dotted];
+    87 -> {88} [style=dotted];
+    88 -> {89} [style=dotted];
+    88 -> {78} [color=green style=dotted];
+    89 -> {90};
     90 -> {91};
     91 -> {92};
-    92 -> {89 93};
-    93 -> {94};
+    92 -> {93};
+
+    subgraph cluster_26 {
+        color=red
+        94 [label="Enter function test_5" style="filled" fillcolor=red];
+        subgraph cluster_27 {
+            color=blue
+            95 [label="Enter block"];
+            subgraph cluster_28 {
+                color=blue
+                96 [label="Enter while loop"];
+                subgraph cluster_29 {
+                    color=blue
+                    97 [label="Enter loop condition"];
+                    98 [label="Access variable R|<local>/b|"];
+                    99 [label="Exit loop condition"];
+                }
+                subgraph cluster_30 {
+                    color=blue
+                    100 [label="Enter loop block"];
+                    subgraph cluster_31 {
+                        color=blue
+                        101 [label="Enter block"];
+                        subgraph cluster_32 {
+                            color=blue
+                            102 [label="Enter when"];
+                            subgraph cluster_33 {
+                                color=blue
+                                103 [label="Enter when branch condition "];
+                                104 [label="Access variable R|<local>/b|"];
+                                105 [label="Exit when branch condition"];
+                            }
+                            106 [label="Synthetic else branch"];
+                            107 [label="Enter when branch result"];
+                            subgraph cluster_34 {
+                                color=blue
+                                108 [label="Enter block"];
+                                109 [label="Jump: continue@@@[R|<local>/b|] "];
+                                110 [label="Stub" style="filled" fillcolor=gray];
+                                111 [label="Exit block" style="filled" fillcolor=gray];
+                            }
+                            112 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            113 [label="Exit when"];
+                        }
+                        114 [label="Exit block"];
+                    }
+                    115 [label="Exit loop block"];
+                }
+                116 [label="Exit whileloop"];
+            }
+            117 [label="Exit block"];
+        }
+        118 [label="Exit function test_5" style="filled" fillcolor=red];
+    }
     94 -> {95};
-    95 -> {97};
-    96 -> {107};
+    95 -> {96};
+    96 -> {97};
     97 -> {98};
     98 -> {99};
-    99 -> {100 106};
+    99 -> {116 100};
     100 -> {101};
     101 -> {102};
-    102 -> {88};
-    102 -> {103} [style=dotted];
-    103 -> {104} [style=dotted];
-    104 -> {105} [style=dotted];
-    105 -> {96} [style=dotted];
-    106 -> {96};
+    102 -> {103};
+    103 -> {104};
+    104 -> {105};
+    105 -> {107 106};
+    106 -> {113};
     107 -> {108};
-    108 -> {90};
+    108 -> {109};
+    109 -> {110} [style=dotted];
+    109 -> {96} [color=green style=dashed];
+    110 -> {111} [style=dotted];
+    111 -> {112} [style=dotted];
+    112 -> {113} [style=dotted];
+    113 -> {114};
+    114 -> {115};
+    115 -> {97} [color=green style=dashed];
+    116 -> {117};
+    117 -> {118};
 
-    subgraph cluster_30 {
+    subgraph cluster_35 {
         color=red
-        109 [label="Enter function run" style="filled" fillcolor=red];
-        111 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
-        110 [label="Exit function run" style="filled" fillcolor=red];
-    }
-    109 -> {111};
-    111 -> {110};
-
-    subgraph cluster_31 {
-        color=red
-        112 [label="Enter function test_6" style="filled" fillcolor=red];
-        114 [label="Postponed enter to lambda"];
-        subgraph cluster_32 {
+        119 [label="Enter function run" style="filled" fillcolor=red];
+        subgraph cluster_36 {
             color=blue
-            117 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            119 [label="Jump: ^@run Unit"];
-            120 [label="Stub" style="filled" fillcolor=gray];
-            118 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            120 [label="Enter block"];
+            121 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            122 [label="Exit block"];
         }
-        115 [label="Postponed exit from lambda"];
-        116 [label="Function call: R|/run|(...)"];
-        113 [label="Exit function test_6" style="filled" fillcolor=red];
+        123 [label="Exit function run" style="filled" fillcolor=red];
     }
-    112 -> {114};
-    114 -> {117};
-    114 -> {115} [color=red];
-    115 -> {116};
-    116 -> {113};
-    117 -> {118 119};
-    118 -> {117};
-    118 -> {115} [color=green];
-    119 -> {118};
-    119 -> {120} [style=dotted];
-    120 -> {118} [style=dotted];
+    119 -> {120};
+    120 -> {121};
+    121 -> {122};
+    122 -> {123};
+
+    subgraph cluster_37 {
+        color=red
+        124 [label="Enter function test_6" style="filled" fillcolor=red];
+        subgraph cluster_38 {
+            color=blue
+            125 [label="Enter block"];
+            126 [label="Postponed enter to lambda"];
+            subgraph cluster_39 {
+                color=blue
+                131 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_40 {
+                    color=blue
+                    132 [label="Enter block"];
+                    133 [label="Jump: ^@run Unit"];
+                    134 [label="Stub" style="filled" fillcolor=gray];
+                    135 [label="Exit block" style="filled" fillcolor=gray];
+                }
+                136 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            127 [label="Postponed exit from lambda"];
+            128 [label="Function call: R|/run|(...)"];
+            129 [label="Exit block"];
+        }
+        130 [label="Exit function test_6" style="filled" fillcolor=red];
+    }
+    124 -> {125};
+    125 -> {126};
+    126 -> {131};
+    126 -> {127} [color=red];
+    127 -> {128};
+    128 -> {129};
+    129 -> {130};
+    131 -> {136 132};
+    132 -> {133};
+    133 -> {136};
+    133 -> {134} [style=dotted];
+    134 -> {135} [style=dotted];
+    135 -> {136} [style=dotted];
+    136 -> {127} [color=green];
+    136 -> {131} [color=green style=dashed];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.dot

@@ -5,75 +5,106 @@ digraph lambdaAsReturnOfLambda_kt {
 
     subgraph cluster_0 {
         color=red
-        10 [label="Enter property" style="filled" fillcolor=red];
-        subgraph cluster_1 {
-            color=blue
-            8 [label="Enter function getter" style="filled" fillcolor=red];
-            9 [label="Exit function getter" style="filled" fillcolor=red];
-        }
-        12 [label="Postponed enter to lambda"];
+        14 [label="Enter function getter" style="filled" fillcolor=red];
+        15 [label="Exit function getter" style="filled" fillcolor=red];
+    }
+    14 -> {15};
+
+    subgraph cluster_1 {
+        color=red
+        16 [label="Enter property" style="filled" fillcolor=red];
+        17 [label="Postponed enter to lambda"];
         subgraph cluster_2 {
             color=blue
             0 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            2 [label="Jump: ^@run lambda@fun <anonymous>(foo: R|kotlin/String|): R|kotlin/Unit| {
+            subgraph cluster_3 {
+                color=blue
+                1 [label="Enter block"];
+                2 [label="Postponed enter to lambda"];
+                subgraph cluster_4 {
+                    color=blue
+                    8 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                    subgraph cluster_5 {
+                        color=blue
+                        9 [label="Enter block"];
+                        10 [label="Access variable R|<local>/foo|"];
+                        11 [label="Function call: R|/bar|(...)"];
+                        12 [label="Exit block"];
+                    }
+                    13 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                }
+                3 [label="Postponed exit from lambda"];
+                4 [label="Jump: ^@run lambda@fun <anonymous>(foo: R|kotlin/String|): R|kotlin/Unit| {
     R|/bar|(R|<local>/foo|)
 }
 "];
-            3 [label="Stub" style="filled" fillcolor=gray];
-            1 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                5 [label="Stub" style="filled" fillcolor=gray];
+                6 [label="Exit block" style="filled" fillcolor=gray];
+            }
+            7 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
         }
-        subgraph cluster_3 {
+        18 [label="Postponed exit from lambda"];
+        subgraph cluster_6 {
             color=blue
-            4 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            6 [label="Access variable R|<local>/foo|"];
-            7 [label="Function call: R|/bar|(...)"];
-            5 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            19 [label="Enter block"];
+            20 [label="Exit block"];
         }
-        13 [label="Postponed exit from lambda"];
-        subgraph cluster_4 {
-            color=blue
-            14 [label="Enter block"];
-            15 [label="Exit block"];
-        }
-        16 [label="Function call: R|/run|<R|(kotlin/String) -> kotlin/Unit|>(...)"];
-        11 [label="Exit property" style="filled" fillcolor=red];
+        21 [label="Function call: R|/run|<R|(kotlin/String) -> kotlin/Unit|>(...)"];
+        22 [label="Exit property" style="filled" fillcolor=red];
     }
-    10 -> {12};
-    12 -> {13};
-    12 -> {0} [color=red];
-    13 -> {14};
-    14 -> {15};
-    15 -> {16};
-    16 -> {11};
-    0 -> {2};
-    0 -> {4} [color=red];
-    2 -> {1};
-    2 -> {3} [style=dotted];
-    3 -> {1} [style=dotted];
-    4 -> {6};
-    6 -> {7};
-    7 -> {5};
-    8 -> {9};
-
-    subgraph cluster_5 {
-        color=red
-        17 [label="Enter function bar" style="filled" fillcolor=red];
-        18 [label="Exit function bar" style="filled" fillcolor=red];
-    }
-    17 -> {18};
-
-    subgraph cluster_6 {
-        color=red
-        19 [label="Enter function run" style="filled" fillcolor=red];
-        21 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|R|>|()"];
-        22 [label="Jump: ^run R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|R|>|()"];
-        23 [label="Stub" style="filled" fillcolor=gray];
-        20 [label="Exit function run" style="filled" fillcolor=red];
-    }
-    19 -> {21};
+    16 -> {17};
+    17 -> {18 0};
+    18 -> {19};
+    19 -> {20};
+    20 -> {21};
     21 -> {22};
-    22 -> {20};
-    22 -> {23} [style=dotted];
-    23 -> {20} [style=dotted];
+    0 -> {1};
+    1 -> {2};
+    2 -> {3 8};
+    3 -> {4};
+    4 -> {7};
+    4 -> {5} [style=dotted];
+    5 -> {6} [style=dotted];
+    6 -> {7} [style=dotted];
+    8 -> {9};
+    9 -> {10};
+    10 -> {11};
+    11 -> {12};
+    12 -> {13};
+
+    subgraph cluster_7 {
+        color=red
+        23 [label="Enter function bar" style="filled" fillcolor=red];
+        subgraph cluster_8 {
+            color=blue
+            24 [label="Enter block"];
+            25 [label="Exit block"];
+        }
+        26 [label="Exit function bar" style="filled" fillcolor=red];
+    }
+    23 -> {24};
+    24 -> {25};
+    25 -> {26};
+
+    subgraph cluster_9 {
+        color=red
+        27 [label="Enter function run" style="filled" fillcolor=red];
+        subgraph cluster_10 {
+            color=blue
+            28 [label="Enter block"];
+            29 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|R|>|()"];
+            30 [label="Jump: ^run R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|R|>|()"];
+            31 [label="Stub" style="filled" fillcolor=gray];
+            32 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        33 [label="Exit function run" style="filled" fillcolor=red];
+    }
+    27 -> {28};
+    28 -> {29};
+    29 -> {30};
+    30 -> {33};
+    30 -> {31} [style=dotted];
+    31 -> {32} [style=dotted];
+    32 -> {33} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/lambdaReturningObject.dot

@@ -13,71 +13,98 @@ digraph lambdaReturningObject_kt {
     subgraph cluster_1 {
         color=red
         2 [label="Enter function bar" style="filled" fillcolor=red];
-        3 [label="Exit function bar" style="filled" fillcolor=red];
+        subgraph cluster_2 {
+            color=blue
+            3 [label="Enter block"];
+            4 [label="Exit block"];
+        }
+        5 [label="Exit function bar" style="filled" fillcolor=red];
     }
     2 -> {3};
-
-    subgraph cluster_2 {
-        color=red
-        4 [label="Enter class IrTypeArgument" style="filled" fillcolor=red];
-        5 [label="Exit class IrTypeArgument" style="filled" fillcolor=red];
-    }
-    4 -> {5} [color=green];
+    3 -> {4};
+    4 -> {5};
 
     subgraph cluster_3 {
         color=red
-        6 [label="Enter function <init>" style="filled" fillcolor=red];
-        8 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        7 [label="Exit function <init>" style="filled" fillcolor=red];
+        6 [label="Enter class IrTypeArgument" style="filled" fillcolor=red];
+        7 [label="Exit class IrTypeArgument" style="filled" fillcolor=red];
     }
-    6 -> {8};
-    8 -> {7};
+    6 -> {7} [color=green];
 
     subgraph cluster_4 {
         color=red
-        9 [label="Enter class IrStarProjectionImpl" style="filled" fillcolor=red];
-        10 [label="Exit class IrStarProjectionImpl" style="filled" fillcolor=red];
+        8 [label="Enter class IrStarProjectionImpl" style="filled" fillcolor=red];
+        9 [label="Exit class IrStarProjectionImpl" style="filled" fillcolor=red];
     }
-    9 -> {10} [color=green];
+    8 -> {9} [color=green];
 
     subgraph cluster_5 {
         color=red
-        11 [label="Enter function MyOut" style="filled" fillcolor=red];
-        13 [label="Function call: R|kotlin/TODO|()"];
-        14 [label="Stub" style="filled" fillcolor=gray];
-        15 [label="Jump: ^MyOut R|kotlin/TODO|()" style="filled" fillcolor=gray];
-        16 [label="Stub" style="filled" fillcolor=gray];
-        12 [label="Exit function MyOut" style="filled" fillcolor=red];
+        10 [label="Enter function <init>" style="filled" fillcolor=red];
+        11 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        12 [label="Exit function <init>" style="filled" fillcolor=red];
     }
-    11 -> {13};
-    13 -> {12};
-    13 -> {14} [style=dotted];
-    14 -> {15} [style=dotted];
-    15 -> {12 16} [style=dotted];
-    16 -> {12} [style=dotted];
+    10 -> {11};
+    11 -> {12};
 
     subgraph cluster_6 {
         color=red
-        17 [label="Enter function foo" style="filled" fillcolor=red];
-        19 [label="Postponed enter to lambda"];
+        13 [label="Enter function MyOut" style="filled" fillcolor=red];
         subgraph cluster_7 {
             color=blue
-            23 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            25 [label="Access qualifier /IrStarProjectionImpl"];
-            24 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            14 [label="Enter block"];
+            15 [label="Function call: R|kotlin/TODO|()"];
+            16 [label="Stub" style="filled" fillcolor=gray];
+            17 [label="Jump: ^MyOut R|kotlin/TODO|()" style="filled" fillcolor=gray];
+            18 [label="Stub" style="filled" fillcolor=gray];
+            19 [label="Exit block" style="filled" fillcolor=gray];
         }
-        20 [label="Postponed exit from lambda"];
-        21 [label="Function call: R|/MyOut|<R|IrStarProjectionImpl|>(...)"];
-        22 [label="Function call: R|/bar|(...)"];
-        18 [label="Exit function foo" style="filled" fillcolor=red];
+        20 [label="Exit function MyOut" style="filled" fillcolor=red];
+    }
+    13 -> {14};
+    14 -> {15};
+    15 -> {20};
+    15 -> {16} [style=dotted];
+    16 -> {17} [style=dotted];
+    17 -> {20 18} [style=dotted];
+    18 -> {19} [style=dotted];
+    19 -> {20} [style=dotted];
+
+    subgraph cluster_8 {
+        color=red
+        21 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_9 {
+            color=blue
+            22 [label="Enter block"];
+            23 [label="Postponed enter to lambda"];
+            subgraph cluster_10 {
+                color=blue
+                29 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_11 {
+                    color=blue
+                    30 [label="Enter block"];
+                    31 [label="Access qualifier /IrStarProjectionImpl"];
+                    32 [label="Exit block"];
+                }
+                33 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            24 [label="Postponed exit from lambda"];
+            25 [label="Function call: R|/MyOut|<R|IrStarProjectionImpl|>(...)"];
+            26 [label="Function call: R|/bar|(...)"];
+            27 [label="Exit block"];
+        }
+        28 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    17 -> {19};
-    19 -> {20};
-    19 -> {23} [color=red];
-    20 -> {21};
     21 -> {22};
-    22 -> {18};
-    23 -> {25};
-    25 -> {24};
+    22 -> {23};
+    23 -> {24 29};
+    24 -> {25};
+    25 -> {26};
+    26 -> {27};
+    27 -> {28};
+    29 -> {30};
+    30 -> {31};
+    31 -> {32};
+    32 -> {33};
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.dot

@@ -6,208 +6,281 @@ digraph lambdas_kt {
     subgraph cluster_0 {
         color=red
         0 [label="Enter function run" style="filled" fillcolor=red];
-        2 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
-        1 [label="Exit function run" style="filled" fillcolor=red];
-    }
-    0 -> {2};
-    2 -> {1};
-
-    subgraph cluster_1 {
-        color=red
-        3 [label="Enter function test_1" style="filled" fillcolor=red];
-        subgraph cluster_2 {
+        subgraph cluster_1 {
             color=blue
-            5 [label="Enter when"];
-            subgraph cluster_3 {
-                color=blue
-                7 [label="Enter when branch condition "];
-                8 [label="Access variable R|<local>/x|"];
-                9 [label="Type operator: (R|<local>/x| is R|kotlin/Int|)"];
-                10 [label="Exit when branch condition"];
-            }
-            18 [label="Synthetic else branch"];
-            11 [label="Enter when branch result"];
+            1 [label="Enter block"];
+            2 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            3 [label="Exit block"];
+        }
+        4 [label="Exit function run" style="filled" fillcolor=red];
+    }
+    0 -> {1};
+    1 -> {2};
+    2 -> {3};
+    3 -> {4};
+
+    subgraph cluster_2 {
+        color=red
+        5 [label="Enter function test_1" style="filled" fillcolor=red];
+        subgraph cluster_3 {
+            color=blue
+            6 [label="Enter block"];
             subgraph cluster_4 {
                 color=blue
-                12 [label="Enter block"];
-                13 [label="Postponed enter to lambda"];
+                7 [label="Enter when"];
                 subgraph cluster_5 {
                     color=blue
-                    19 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                    21 [label="Access variable R|<local>/x|"];
-                    22 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
-                    20 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                    8 [label="Enter when branch condition "];
+                    9 [label="Access variable R|<local>/x|"];
+                    10 [label="Type operator: (R|<local>/x| is R|kotlin/Int|)"];
+                    11 [label="Exit when branch condition"];
                 }
-                14 [label="Postponed exit from lambda"];
-                15 [label="Function call: R|/run|(...)"];
-                16 [label="Exit block"];
+                12 [label="Synthetic else branch"];
+                13 [label="Enter when branch result"];
+                subgraph cluster_6 {
+                    color=blue
+                    14 [label="Enter block"];
+                    15 [label="Postponed enter to lambda"];
+                    subgraph cluster_7 {
+                        color=blue
+                        23 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                        subgraph cluster_8 {
+                            color=blue
+                            24 [label="Enter block"];
+                            25 [label="Access variable R|<local>/x|"];
+                            26 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+                            27 [label="Exit block"];
+                        }
+                        28 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                    }
+                    16 [label="Postponed exit from lambda"];
+                    17 [label="Function call: R|/run|(...)"];
+                    18 [label="Exit block"];
+                }
+                19 [label="Exit when branch result"];
+                20 [label="Exit when"];
             }
-            17 [label="Exit when branch result"];
-            6 [label="Exit when"];
+            21 [label="Exit block"];
         }
-        4 [label="Exit function test_1" style="filled" fillcolor=red];
+        22 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    3 -> {5};
-    5 -> {7};
-    6 -> {4};
+    5 -> {6};
+    6 -> {7};
     7 -> {8};
     8 -> {9};
     9 -> {10};
-    10 -> {11 18};
-    11 -> {12};
-    12 -> {13};
-    13 -> {19};
-    13 -> {14} [color=red];
+    10 -> {11};
+    11 -> {13 12};
+    12 -> {20};
+    13 -> {14};
     14 -> {15};
-    15 -> {16};
+    15 -> {23};
+    15 -> {16} [color=red];
     16 -> {17};
-    17 -> {6};
-    18 -> {6};
-    19 -> {20 21};
-    20 -> {19};
-    20 -> {14} [color=green];
+    17 -> {18};
+    18 -> {19};
+    19 -> {20};
+    20 -> {21};
     21 -> {22};
-    22 -> {20};
+    23 -> {28 24};
+    24 -> {25};
+    25 -> {26};
+    26 -> {27};
+    27 -> {28};
+    28 -> {16} [color=green];
+    28 -> {23} [color=green style=dashed];
 
-    subgraph cluster_6 {
+    subgraph cluster_9 {
         color=red
-        23 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_7 {
-            color=blue
-            25 [label="Enter when"];
-            subgraph cluster_8 {
-                color=blue
-                27 [label="Enter when branch condition "];
-                28 [label="Access variable R|<local>/x|"];
-                29 [label="Type operator: (R|<local>/x| is R|kotlin/Int|)"];
-                30 [label="Exit when branch condition"];
-            }
-            36 [label="Synthetic else branch"];
-            31 [label="Enter when branch result"];
-            subgraph cluster_9 {
-                color=blue
-                32 [label="Enter block"];
-                33 [label="Variable declaration: lval lambda: R|() -> kotlin/Int|"];
-                34 [label="Exit block"];
-            }
-            35 [label="Exit when branch result"];
-            26 [label="Exit when"];
-        }
+        29 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_10 {
             color=blue
-            37 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            39 [label="Access variable R|<local>/x|"];
-            40 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
-            38 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            30 [label="Enter block"];
+            subgraph cluster_11 {
+                color=blue
+                31 [label="Enter when"];
+                subgraph cluster_12 {
+                    color=blue
+                    32 [label="Enter when branch condition "];
+                    33 [label="Access variable R|<local>/x|"];
+                    34 [label="Type operator: (R|<local>/x| is R|kotlin/Int|)"];
+                    35 [label="Exit when branch condition"];
+                }
+                36 [label="Synthetic else branch"];
+                37 [label="Enter when branch result"];
+                subgraph cluster_13 {
+                    color=blue
+                    38 [label="Enter block"];
+                    39 [label="Postponed enter to lambda"];
+                    subgraph cluster_14 {
+                        color=blue
+                        47 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                        subgraph cluster_15 {
+                            color=blue
+                            48 [label="Enter block"];
+                            49 [label="Access variable R|<local>/x|"];
+                            50 [label="Function call: R|<local>/x|.R|kotlin/Int.inc|()"];
+                            51 [label="Exit block"];
+                        }
+                        52 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                    }
+                    40 [label="Postponed exit from lambda"];
+                    41 [label="Variable declaration: lval lambda: R|() -> kotlin/Int|"];
+                    42 [label="Exit block"];
+                }
+                43 [label="Exit when branch result"];
+                44 [label="Exit when"];
+            }
+            45 [label="Exit block"];
         }
-        24 [label="Exit function test_2" style="filled" fillcolor=red];
+        46 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    23 -> {25};
-    25 -> {27};
-    26 -> {24};
-    27 -> {28};
-    28 -> {29};
     29 -> {30};
-    30 -> {31 36};
+    30 -> {31};
     31 -> {32};
     32 -> {33};
-    32 -> {37} [color=red];
     33 -> {34};
     34 -> {35};
-    35 -> {26};
-    36 -> {26};
-    37 -> {39};
-    39 -> {40};
-    40 -> {38};
-
-    subgraph cluster_11 {
-        color=red
-        41 [label="Enter function getInt" style="filled" fillcolor=red];
-        43 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
-        44 [label="Const: Int(1)"];
-        45 [label="Jump: ^getInt Int(1)"];
-        46 [label="Stub" style="filled" fillcolor=gray];
-        42 [label="Exit function getInt" style="filled" fillcolor=red];
-    }
-    41 -> {43};
+    35 -> {37 36};
+    36 -> {44};
+    37 -> {38};
+    38 -> {39};
+    39 -> {40 47};
+    40 -> {41};
+    41 -> {42};
+    42 -> {43};
     43 -> {44};
     44 -> {45};
-    45 -> {42};
-    45 -> {46} [style=dotted];
-    46 -> {42} [style=dotted];
+    45 -> {46};
+    47 -> {48};
+    48 -> {49};
+    49 -> {50};
+    50 -> {51};
+    51 -> {52};
 
-    subgraph cluster_12 {
+    subgraph cluster_16 {
         color=red
-        47 [label="Enter function test_3" style="filled" fillcolor=red];
-        49 [label="Postponed enter to lambda"];
-        subgraph cluster_13 {
+        53 [label="Enter function getInt" style="filled" fillcolor=red];
+        subgraph cluster_17 {
             color=blue
-            54 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+            54 [label="Enter block"];
+            55 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
             56 [label="Const: Int(1)"];
-            57 [label="Jump: ^test_3 Int(1)"];
+            57 [label="Jump: ^getInt Int(1)"];
             58 [label="Stub" style="filled" fillcolor=gray];
-            55 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            59 [label="Exit block" style="filled" fillcolor=gray];
         }
-        50 [label="Postponed exit from lambda"];
-        51 [label="Function call: R|/getInt|(...)"];
-        52 [label="Jump: ^test_3 R|/getInt|(<L> = getInt@fun <anonymous>(): R|kotlin/Unit| <kind=UNKNOWN>  {
+        60 [label="Exit function getInt" style="filled" fillcolor=red];
+    }
+    53 -> {54};
+    54 -> {55};
+    55 -> {56};
+    56 -> {57};
+    57 -> {60};
+    57 -> {58} [style=dotted];
+    58 -> {59} [style=dotted];
+    59 -> {60} [style=dotted];
+
+    subgraph cluster_18 {
+        color=red
+        61 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_19 {
+            color=blue
+            62 [label="Enter block"];
+            63 [label="Postponed enter to lambda"];
+            subgraph cluster_20 {
+                color=blue
+                70 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_21 {
+                    color=blue
+                    71 [label="Enter block"];
+                    72 [label="Const: Int(1)"];
+                    73 [label="Jump: ^test_3 Int(1)"];
+                    74 [label="Stub" style="filled" fillcolor=gray];
+                    75 [label="Exit block" style="filled" fillcolor=gray];
+                }
+                76 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            64 [label="Postponed exit from lambda"];
+            65 [label="Function call: R|/getInt|(...)"];
+            66 [label="Jump: ^test_3 R|/getInt|(<L> = getInt@fun <anonymous>(): R|kotlin/Unit| <kind=UNKNOWN>  {
     ^test_3 Int(1)
 }
 )"];
-        53 [label="Stub" style="filled" fillcolor=gray];
-        48 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
-    47 -> {49};
-    49 -> {54};
-    49 -> {50} [color=red];
-    50 -> {51};
-    51 -> {52};
-    52 -> {48};
-    52 -> {53} [style=dotted];
-    53 -> {48} [style=dotted];
-    54 -> {55 56};
-    55 -> {54};
-    55 -> {50} [color=green];
-    56 -> {57};
-    57 -> {48};
-    57 -> {58} [style=dotted];
-    58 -> {55} [style=dotted];
-
-    subgraph cluster_14 {
-        color=red
-        59 [label="Enter function test_4" style="filled" fillcolor=red];
-        61 [label="Postponed enter to lambda"];
-        subgraph cluster_15 {
-            color=blue
-            66 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            68 [label="Const: Int(1)"];
-            69 [label="Jump: ^test_4 Int(1)"];
-            70 [label="Stub" style="filled" fillcolor=gray];
-            67 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            67 [label="Stub" style="filled" fillcolor=gray];
+            68 [label="Exit block" style="filled" fillcolor=gray];
         }
-        62 [label="Postponed exit from lambda"];
-        63 [label="Function call: R|/getInt|(...)"];
-        64 [label="Jump: ^test_4 R|/getInt|(block = getInt@fun <anonymous>(): R|kotlin/Unit| <kind=UNKNOWN>  {
+        69 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
+    61 -> {62};
+    62 -> {63};
+    63 -> {70};
+    63 -> {64} [color=red];
+    64 -> {65};
+    65 -> {66};
+    66 -> {69};
+    66 -> {67} [style=dotted];
+    67 -> {68} [style=dotted];
+    68 -> {69} [style=dotted];
+    70 -> {76 71};
+    71 -> {72};
+    72 -> {73};
+    73 -> {69};
+    73 -> {74} [style=dotted];
+    74 -> {75} [style=dotted];
+    75 -> {76} [style=dotted];
+    76 -> {64} [color=green];
+    76 -> {70} [color=green style=dashed];
+
+    subgraph cluster_22 {
+        color=red
+        77 [label="Enter function test_4" style="filled" fillcolor=red];
+        subgraph cluster_23 {
+            color=blue
+            78 [label="Enter block"];
+            79 [label="Postponed enter to lambda"];
+            subgraph cluster_24 {
+                color=blue
+                86 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_25 {
+                    color=blue
+                    87 [label="Enter block"];
+                    88 [label="Const: Int(1)"];
+                    89 [label="Jump: ^test_4 Int(1)"];
+                    90 [label="Stub" style="filled" fillcolor=gray];
+                    91 [label="Exit block" style="filled" fillcolor=gray];
+                }
+                92 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            80 [label="Postponed exit from lambda"];
+            81 [label="Function call: R|/getInt|(...)"];
+            82 [label="Jump: ^test_4 R|/getInt|(block = getInt@fun <anonymous>(): R|kotlin/Unit| <kind=UNKNOWN>  {
     ^test_4 Int(1)
 }
 )"];
-        65 [label="Stub" style="filled" fillcolor=gray];
-        60 [label="Exit function test_4" style="filled" fillcolor=red];
+            83 [label="Stub" style="filled" fillcolor=gray];
+            84 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        85 [label="Exit function test_4" style="filled" fillcolor=red];
     }
-    59 -> {61};
-    61 -> {66};
-    61 -> {62} [color=red];
-    62 -> {63};
-    63 -> {64};
-    64 -> {60};
-    64 -> {65} [style=dotted];
-    65 -> {60} [style=dotted];
-    66 -> {67 68};
-    67 -> {66};
-    67 -> {62} [color=green];
-    68 -> {69};
-    69 -> {60};
-    69 -> {70} [style=dotted];
-    70 -> {67} [style=dotted];
+    77 -> {78};
+    78 -> {79};
+    79 -> {86};
+    79 -> {80} [color=red];
+    80 -> {81};
+    81 -> {82};
+    82 -> {85};
+    82 -> {83} [style=dotted];
+    83 -> {84} [style=dotted];
+    84 -> {85} [style=dotted];
+    86 -> {92 87};
+    87 -> {88};
+    88 -> {89};
+    89 -> {85};
+    89 -> {90} [style=dotted];
+    90 -> {91} [style=dotted];
+    91 -> {92} [style=dotted];
+    92 -> {80} [color=green];
+    92 -> {86} [color=green style=dashed];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.dot

@@ -6,159 +6,160 @@ digraph localClassesWithImplicit_kt {
     subgraph cluster_0 {
         color=red
         0 [label="Enter function myRun" style="filled" fillcolor=red];
-        2 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()"];
-        3 [label="Jump: ^myRun R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()"];
-        4 [label="Stub" style="filled" fillcolor=gray];
-        1 [label="Exit function myRun" style="filled" fillcolor=red];
-    }
-    0 -> {2};
-    2 -> {3};
-    3 -> {1};
-    3 -> {4} [style=dotted];
-    4 -> {1} [style=dotted];
-
-    subgraph cluster_1 {
-        color=red
-        5 [label="Enter function test" style="filled" fillcolor=red];
-        subgraph cluster_2 {
+        subgraph cluster_1 {
             color=blue
-            7 [label="Enter when"];
-            subgraph cluster_3 {
-                color=blue
-                9 [label="Enter when branch condition "];
-                10 [label="Access variable R|<local>/a|"];
-                11 [label="Type operator: (R|<local>/a| !is R|kotlin/String|)"];
-                12 [label="Exit when branch condition"];
-            }
-            19 [label="Synthetic else branch"];
-            13 [label="Enter when branch result"];
-            subgraph cluster_4 {
-                color=blue
-                14 [label="Enter block"];
-                15 [label="Jump: ^test Unit"];
-                16 [label="Stub" style="filled" fillcolor=gray];
-                17 [label="Exit block" style="filled" fillcolor=gray];
-            }
-            18 [label="Exit when branch result" style="filled" fillcolor=gray];
-            8 [label="Exit when"];
+            1 [label="Enter block"];
+            2 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()"];
+            3 [label="Jump: ^myRun R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|T|>|()"];
+            4 [label="Stub" style="filled" fillcolor=gray];
+            5 [label="Exit block" style="filled" fillcolor=gray];
         }
-        20 [label="Exit local class test"];
-        21 [label="Exit anonymous object"];
-        22 [label="Variable declaration: lval x: R|<anonymous>|"];
-        6 [label="Exit function test" style="filled" fillcolor=red];
+        6 [label="Exit function myRun" style="filled" fillcolor=red];
     }
-    5 -> {7};
-    7 -> {9};
-    8 -> {20};
-    8 -> {23 26 57 71} [color=red];
+    0 -> {1};
+    1 -> {2};
+    2 -> {3};
+    3 -> {6};
+    3 -> {4} [style=dotted];
+    4 -> {5} [style=dotted];
+    5 -> {6} [style=dotted];
+
+    subgraph cluster_2 {
+        color=red
+        7 [label="Enter function test" style="filled" fillcolor=red];
+        subgraph cluster_3 {
+            color=blue
+            29 [label="Enter class <anonymous object>" style="filled" fillcolor=red];
+            30 [label="Exit class <anonymous object>" style="filled" fillcolor=red];
+        }
+        subgraph cluster_4 {
+            color=blue
+            27 [label="Enter class A" style="filled" fillcolor=red];
+            28 [label="Exit class A" style="filled" fillcolor=red];
+        }
+        subgraph cluster_5 {
+            color=blue
+            8 [label="Enter block"];
+            subgraph cluster_6 {
+                color=blue
+                9 [label="Enter when"];
+                subgraph cluster_7 {
+                    color=blue
+                    10 [label="Enter when branch condition "];
+                    11 [label="Access variable R|<local>/a|"];
+                    12 [label="Type operator: (R|<local>/a| !is R|kotlin/String|)"];
+                    13 [label="Exit when branch condition"];
+                }
+                14 [label="Synthetic else branch"];
+                15 [label="Enter when branch result"];
+                subgraph cluster_8 {
+                    color=blue
+                    16 [label="Enter block"];
+                    17 [label="Jump: ^test Unit"];
+                    18 [label="Stub" style="filled" fillcolor=gray];
+                    19 [label="Exit block" style="filled" fillcolor=gray];
+                }
+                20 [label="Exit when branch result" style="filled" fillcolor=gray];
+                21 [label="Exit when"];
+            }
+            22 [label="Exit local class test"];
+            23 [label="Exit anonymous object"];
+            24 [label="Variable declaration: lval x: R|<anonymous>|"];
+            25 [label="Exit block"];
+        }
+        26 [label="Exit function test" style="filled" fillcolor=red];
+    }
+    7 -> {8};
+    8 -> {9};
     9 -> {10};
     10 -> {11};
     11 -> {12};
-    12 -> {13 19};
-    13 -> {14};
-    14 -> {15};
-    15 -> {6};
-    15 -> {16} [style=dotted];
-    16 -> {17} [style=dotted];
+    12 -> {13};
+    13 -> {15 14};
+    14 -> {21};
+    15 -> {16};
+    16 -> {17};
+    17 -> {26};
     17 -> {18} [style=dotted];
-    18 -> {8} [style=dotted];
-    19 -> {8};
-    20 -> {21};
-    20 -> {78 81 112 126} [color=red];
+    18 -> {19} [style=dotted];
+    19 -> {20} [style=dotted];
+    20 -> {21} [style=dotted];
     21 -> {22};
-    22 -> {6};
+    21 -> {31 34 69 87} [color=red];
+    22 -> {23};
+    22 -> {94 97 132 150} [color=red];
+    23 -> {24};
+    24 -> {25};
+    25 -> {26};
+    27 -> {28} [color=green];
+    29 -> {30} [color=green];
 
-    subgraph cluster_5 {
+    subgraph cluster_9 {
         color=red
-        23 [label="Enter function <init>" style="filled" fillcolor=red];
-        25 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        24 [label="Exit function <init>" style="filled" fillcolor=red];
+        31 [label="Enter function <init>" style="filled" fillcolor=red];
+        32 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        33 [label="Exit function <init>" style="filled" fillcolor=red];
     }
-    23 -> {25};
-    25 -> {24};
+    31 -> {32};
+    32 -> {33};
 
-    subgraph cluster_6 {
+    subgraph cluster_10 {
         color=red
-        26 [label="Enter function foo" style="filled" fillcolor=red];
-        subgraph cluster_7 {
+        34 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_11 {
             color=blue
-            71 [label="Enter function baz" style="filled" fillcolor=red];
-            73 [label="Const: Int(1)"];
-            74 [label="Jump: ^baz Int(1)"];
-            75 [label="Stub" style="filled" fillcolor=gray];
-            72 [label="Exit function baz" style="filled" fillcolor=red];
-        }
-        subgraph cluster_8 {
-            color=blue
-            57 [label="Enter function bar" style="filled" fillcolor=red];
-            59 [label="Postponed enter to lambda"];
-            subgraph cluster_9 {
+            35 [label="Enter block"];
+            36 [label="Postponed enter to lambda"];
+            subgraph cluster_12 {
                 color=blue
-                64 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                66 [label="Access variable R|<local>/b|"];
-                67 [label="Access variable <Unresolved name: length>#"];
-                68 [label="Access variable R|<local>/a|"];
-                69 [label="Access variable R|kotlin/String.length|"];
-                70 [label="Function call: this@R|/A|.R|/A.baz|()"];
-                65 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-            }
-            60 [label="Postponed exit from lambda"];
-            61 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
-            62 [label="Jump: ^bar R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <kind=UNKNOWN>  {
-    R|<local>/b|.<Unresolved name: length>#
-    R|<local>/a|.R|kotlin/String.length|
-    ^ this@R|/A|.R|/A.baz|()
-}
-)"];
-            63 [label="Stub" style="filled" fillcolor=gray];
-            58 [label="Exit function bar" style="filled" fillcolor=red];
-        }
-        28 [label="Postponed enter to lambda"];
-        subgraph cluster_10 {
-            color=blue
-            33 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            35 [label="Access variable R|<local>/a|"];
-            36 [label="Access variable R|kotlin/String.length|"];
-            subgraph cluster_11 {
-                color=blue
-                37 [label="Enter when"];
-                subgraph cluster_12 {
-                    color=blue
-                    39 [label="Enter when branch condition "];
-                    40 [label="Access variable R|<local>/b|"];
-                    41 [label="Type operator: (R|<local>/b| is R|kotlin/String|)"];
-                    42 [label="Exit when branch condition"];
-                }
+                43 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_13 {
-                    color=blue
-                    50 [label="Enter when branch condition else"];
-                    51 [label="Exit when branch condition"];
-                }
-                52 [label="Enter when branch result"];
-                subgraph cluster_14 {
-                    color=blue
-                    53 [label="Enter block"];
-                    54 [label="Const: Int(1)"];
-                    55 [label="Exit block"];
-                }
-                56 [label="Exit when branch result"];
-                43 [label="Enter when branch result"];
-                subgraph cluster_15 {
                     color=blue
                     44 [label="Enter block"];
-                    45 [label="Access variable R|<local>/b|"];
+                    45 [label="Access variable R|<local>/a|"];
                     46 [label="Access variable R|kotlin/String.length|"];
-                    47 [label="Function call: this@R|/A|.R|/A.bar|()"];
-                    48 [label="Exit block"];
+                    subgraph cluster_14 {
+                        color=blue
+                        47 [label="Enter when"];
+                        subgraph cluster_15 {
+                            color=blue
+                            48 [label="Enter when branch condition "];
+                            49 [label="Access variable R|<local>/b|"];
+                            50 [label="Type operator: (R|<local>/b| is R|kotlin/String|)"];
+                            51 [label="Exit when branch condition"];
+                        }
+                        subgraph cluster_16 {
+                            color=blue
+                            52 [label="Enter when branch condition else"];
+                            53 [label="Exit when branch condition"];
+                        }
+                        54 [label="Enter when branch result"];
+                        subgraph cluster_17 {
+                            color=blue
+                            55 [label="Enter block"];
+                            56 [label="Const: Int(1)"];
+                            57 [label="Exit block"];
+                        }
+                        58 [label="Exit when branch result"];
+                        59 [label="Enter when branch result"];
+                        subgraph cluster_18 {
+                            color=blue
+                            60 [label="Enter block"];
+                            61 [label="Access variable R|<local>/b|"];
+                            62 [label="Access variable R|kotlin/String.length|"];
+                            63 [label="Function call: this@R|/A|.R|/A.bar|()"];
+                            64 [label="Exit block"];
+                        }
+                        65 [label="Exit when branch result"];
+                        66 [label="Exit when"];
+                    }
+                    67 [label="Exit block"];
                 }
-                49 [label="Exit when branch result"];
-                38 [label="Exit when"];
+                68 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            34 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-        }
-        29 [label="Postponed exit from lambda"];
-        30 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
-        31 [label="Jump: ^foo R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <kind=UNKNOWN>  {
+            37 [label="Postponed exit from lambda"];
+            38 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
+            39 [label="Jump: ^foo R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <kind=UNKNOWN>  {
     R|<local>/a|.R|kotlin/String.length|
     ^ when () {
         (R|<local>/b| is R|kotlin/String|) ->  {
@@ -172,129 +173,192 @@ digraph localClassesWithImplicit_kt {
 
 }
 )"];
-        32 [label="Stub" style="filled" fillcolor=gray];
-        27 [label="Exit function foo" style="filled" fillcolor=red];
+            40 [label="Stub" style="filled" fillcolor=gray];
+            41 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        42 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    26 -> {28};
-    28 -> {33};
-    28 -> {29} [color=red];
-    29 -> {30};
-    30 -> {31};
-    31 -> {27};
-    31 -> {32} [style=dotted];
-    32 -> {27} [style=dotted];
-    33 -> {34 35};
-    34 -> {33};
-    34 -> {29} [color=green];
+    34 -> {35};
     35 -> {36};
-    36 -> {37};
-    37 -> {39};
-    38 -> {34};
-    39 -> {40};
-    40 -> {41};
-    41 -> {42};
-    42 -> {43 50};
-    43 -> {44};
+    36 -> {43};
+    36 -> {37} [color=red];
+    37 -> {38};
+    38 -> {39};
+    39 -> {42};
+    39 -> {40} [style=dotted];
+    40 -> {41} [style=dotted];
+    41 -> {42} [style=dotted];
+    43 -> {68 44};
     44 -> {45};
     45 -> {46};
     46 -> {47};
     47 -> {48};
     48 -> {49};
-    49 -> {38};
+    49 -> {50};
     50 -> {51};
-    51 -> {52};
+    51 -> {59 52};
     52 -> {53};
     53 -> {54};
     54 -> {55};
     55 -> {56};
-    56 -> {38};
-    57 -> {59};
-    59 -> {64};
-    59 -> {60} [color=red];
+    56 -> {57};
+    57 -> {58};
+    58 -> {66};
+    59 -> {60};
     60 -> {61};
     61 -> {62};
-    62 -> {58};
-    62 -> {63} [style=dotted];
-    63 -> {58} [style=dotted];
-    64 -> {65 66};
-    65 -> {64};
-    65 -> {60} [color=green];
+    62 -> {63};
+    63 -> {64};
+    64 -> {65};
+    65 -> {66};
     66 -> {67};
     67 -> {68};
-    68 -> {69};
-    69 -> {70};
-    70 -> {65};
-    71 -> {73};
-    73 -> {74};
-    74 -> {72};
-    74 -> {75} [style=dotted];
-    75 -> {72} [style=dotted];
+    68 -> {37} [color=green];
+    68 -> {43} [color=green style=dashed];
 
-    subgraph cluster_16 {
+    subgraph cluster_19 {
         color=red
-        76 [label="Enter class A" style="filled" fillcolor=red];
-        77 [label="Exit class A" style="filled" fillcolor=red];
-    }
-    76 -> {77} [color=green];
-
-    subgraph cluster_17 {
-        color=red
-        78 [label="Enter function <init>" style="filled" fillcolor=red];
-        80 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        79 [label="Exit function <init>" style="filled" fillcolor=red];
-    }
-    78 -> {80};
-    80 -> {79};
-
-    subgraph cluster_18 {
-        color=red
-        81 [label="Enter function foo" style="filled" fillcolor=red];
-        83 [label="Postponed enter to lambda"];
-        subgraph cluster_19 {
+        69 [label="Enter function bar" style="filled" fillcolor=red];
+        subgraph cluster_20 {
             color=blue
-            88 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            90 [label="Access variable R|<local>/a|"];
-            91 [label="Access variable R|kotlin/String.length|"];
-            subgraph cluster_20 {
+            70 [label="Enter block"];
+            71 [label="Postponed enter to lambda"];
+            subgraph cluster_21 {
                 color=blue
-                92 [label="Enter when"];
-                subgraph cluster_21 {
-                    color=blue
-                    94 [label="Enter when branch condition "];
-                    95 [label="Access variable R|<local>/b|"];
-                    96 [label="Type operator: (R|<local>/b| is R|kotlin/String|)"];
-                    97 [label="Exit when branch condition"];
-                }
+                78 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_22 {
                     color=blue
-                    105 [label="Enter when branch condition else"];
-                    106 [label="Exit when branch condition"];
+                    79 [label="Enter block"];
+                    80 [label="Access variable R|<local>/b|"];
+                    81 [label="Access variable <Unresolved name: length>#"];
+                    82 [label="Access variable R|<local>/a|"];
+                    83 [label="Access variable R|kotlin/String.length|"];
+                    84 [label="Function call: this@R|/A|.R|/A.baz|()"];
+                    85 [label="Exit block"];
                 }
-                107 [label="Enter when branch result"];
-                subgraph cluster_23 {
-                    color=blue
-                    108 [label="Enter block"];
-                    109 [label="Const: Int(1)"];
-                    110 [label="Exit block"];
-                }
-                111 [label="Exit when branch result"];
-                98 [label="Enter when branch result"];
-                subgraph cluster_24 {
-                    color=blue
-                    99 [label="Enter block"];
-                    100 [label="Access variable R|<local>/b|"];
-                    101 [label="Access variable R|kotlin/String.length|"];
-                    102 [label="Function call: this@R|/<anonymous>|.R|/<anonymous>.bar|()"];
-                    103 [label="Exit block"];
-                }
-                104 [label="Exit when branch result"];
-                93 [label="Exit when"];
+                86 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            89 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            72 [label="Postponed exit from lambda"];
+            73 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
+            74 [label="Jump: ^bar R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <kind=UNKNOWN>  {
+    R|<local>/b|.<Unresolved name: length>#
+    R|<local>/a|.R|kotlin/String.length|
+    ^ this@R|/A|.R|/A.baz|()
+}
+)"];
+            75 [label="Stub" style="filled" fillcolor=gray];
+            76 [label="Exit block" style="filled" fillcolor=gray];
         }
-        84 [label="Postponed exit from lambda"];
-        85 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
-        86 [label="Jump: ^foo R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <kind=UNKNOWN>  {
+        77 [label="Exit function bar" style="filled" fillcolor=red];
+    }
+    69 -> {70};
+    70 -> {71};
+    71 -> {78};
+    71 -> {72} [color=red];
+    72 -> {73};
+    73 -> {74};
+    74 -> {77};
+    74 -> {75} [style=dotted];
+    75 -> {76} [style=dotted];
+    76 -> {77} [style=dotted];
+    78 -> {86 79};
+    79 -> {80};
+    80 -> {81};
+    81 -> {82};
+    82 -> {83};
+    83 -> {84};
+    84 -> {85};
+    85 -> {86};
+    86 -> {72} [color=green];
+    86 -> {78} [color=green style=dashed];
+
+    subgraph cluster_23 {
+        color=red
+        87 [label="Enter function baz" style="filled" fillcolor=red];
+        subgraph cluster_24 {
+            color=blue
+            88 [label="Enter block"];
+            89 [label="Const: Int(1)"];
+            90 [label="Jump: ^baz Int(1)"];
+            91 [label="Stub" style="filled" fillcolor=gray];
+            92 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        93 [label="Exit function baz" style="filled" fillcolor=red];
+    }
+    87 -> {88};
+    88 -> {89};
+    89 -> {90};
+    90 -> {93};
+    90 -> {91} [style=dotted];
+    91 -> {92} [style=dotted];
+    92 -> {93} [style=dotted];
+
+    subgraph cluster_25 {
+        color=red
+        94 [label="Enter function <init>" style="filled" fillcolor=red];
+        95 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        96 [label="Exit function <init>" style="filled" fillcolor=red];
+    }
+    94 -> {95};
+    95 -> {96};
+
+    subgraph cluster_26 {
+        color=red
+        97 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_27 {
+            color=blue
+            98 [label="Enter block"];
+            99 [label="Postponed enter to lambda"];
+            subgraph cluster_28 {
+                color=blue
+                106 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_29 {
+                    color=blue
+                    107 [label="Enter block"];
+                    108 [label="Access variable R|<local>/a|"];
+                    109 [label="Access variable R|kotlin/String.length|"];
+                    subgraph cluster_30 {
+                        color=blue
+                        110 [label="Enter when"];
+                        subgraph cluster_31 {
+                            color=blue
+                            111 [label="Enter when branch condition "];
+                            112 [label="Access variable R|<local>/b|"];
+                            113 [label="Type operator: (R|<local>/b| is R|kotlin/String|)"];
+                            114 [label="Exit when branch condition"];
+                        }
+                        subgraph cluster_32 {
+                            color=blue
+                            115 [label="Enter when branch condition else"];
+                            116 [label="Exit when branch condition"];
+                        }
+                        117 [label="Enter when branch result"];
+                        subgraph cluster_33 {
+                            color=blue
+                            118 [label="Enter block"];
+                            119 [label="Const: Int(1)"];
+                            120 [label="Exit block"];
+                        }
+                        121 [label="Exit when branch result"];
+                        122 [label="Enter when branch result"];
+                        subgraph cluster_34 {
+                            color=blue
+                            123 [label="Enter block"];
+                            124 [label="Access variable R|<local>/b|"];
+                            125 [label="Access variable R|kotlin/String.length|"];
+                            126 [label="Function call: this@R|/<anonymous>|.R|/<anonymous>.bar|()"];
+                            127 [label="Exit block"];
+                        }
+                        128 [label="Exit when branch result"];
+                        129 [label="Exit when"];
+                    }
+                    130 [label="Exit block"];
+                }
+                131 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            100 [label="Postponed exit from lambda"];
+            101 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
+            102 [label="Jump: ^foo R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <kind=UNKNOWN>  {
     R|<local>/a|.R|kotlin/String.length|
     ^ when () {
         (R|<local>/b| is R|kotlin/String|) ->  {
@@ -308,104 +372,124 @@ digraph localClassesWithImplicit_kt {
 
 }
 )"];
-        87 [label="Stub" style="filled" fillcolor=gray];
-        82 [label="Exit function foo" style="filled" fillcolor=red];
+            103 [label="Stub" style="filled" fillcolor=gray];
+            104 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        105 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    81 -> {83};
-    83 -> {88};
-    83 -> {84} [color=red];
-    84 -> {85};
-    85 -> {86};
-    86 -> {82};
-    86 -> {87} [style=dotted];
-    87 -> {82} [style=dotted];
-    88 -> {89 90};
-    89 -> {88};
-    89 -> {84} [color=green];
-    90 -> {91};
-    91 -> {92};
-    92 -> {94};
-    93 -> {89};
-    94 -> {95};
-    95 -> {96};
-    96 -> {97};
-    97 -> {98 105};
+    97 -> {98};
     98 -> {99};
-    99 -> {100};
+    99 -> {106};
+    99 -> {100} [color=red];
     100 -> {101};
     101 -> {102};
-    102 -> {103};
-    103 -> {104};
-    104 -> {93};
-    105 -> {106};
-    106 -> {107};
+    102 -> {105};
+    102 -> {103} [style=dotted];
+    103 -> {104} [style=dotted];
+    104 -> {105} [style=dotted];
+    106 -> {131 107};
     107 -> {108};
     108 -> {109};
     109 -> {110};
     110 -> {111};
-    111 -> {93};
+    111 -> {112};
+    112 -> {113};
+    113 -> {114};
+    114 -> {122 115};
+    115 -> {116};
+    116 -> {117};
+    117 -> {118};
+    118 -> {119};
+    119 -> {120};
+    120 -> {121};
+    121 -> {129};
+    122 -> {123};
+    123 -> {124};
+    124 -> {125};
+    125 -> {126};
+    126 -> {127};
+    127 -> {128};
+    128 -> {129};
+    129 -> {130};
+    130 -> {131};
+    131 -> {100} [color=green];
+    131 -> {106} [color=green style=dashed];
 
-    subgraph cluster_25 {
+    subgraph cluster_35 {
         color=red
-        112 [label="Enter function bar" style="filled" fillcolor=red];
-        114 [label="Postponed enter to lambda"];
-        subgraph cluster_26 {
+        132 [label="Enter function bar" style="filled" fillcolor=red];
+        subgraph cluster_36 {
             color=blue
-            119 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            121 [label="Access variable R|<local>/a|"];
-            122 [label="Access variable R|kotlin/String.length|"];
-            123 [label="Access variable R|<local>/b|"];
-            124 [label="Access variable <Unresolved name: length>#"];
-            125 [label="Function call: this@R|/<anonymous>|.R|/<anonymous>.baz|()"];
-            120 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-        }
-        115 [label="Postponed exit from lambda"];
-        116 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
-        117 [label="Jump: ^bar R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <kind=UNKNOWN>  {
+            133 [label="Enter block"];
+            134 [label="Postponed enter to lambda"];
+            subgraph cluster_37 {
+                color=blue
+                141 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_38 {
+                    color=blue
+                    142 [label="Enter block"];
+                    143 [label="Access variable R|<local>/a|"];
+                    144 [label="Access variable R|kotlin/String.length|"];
+                    145 [label="Access variable R|<local>/b|"];
+                    146 [label="Access variable <Unresolved name: length>#"];
+                    147 [label="Function call: this@R|/<anonymous>|.R|/<anonymous>.baz|()"];
+                    148 [label="Exit block"];
+                }
+                149 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            135 [label="Postponed exit from lambda"];
+            136 [label="Function call: R|/myRun|<R|kotlin/Int|>(...)"];
+            137 [label="Jump: ^bar R|/myRun|<R|kotlin/Int|>(<L> = myRun@fun <anonymous>(): R|kotlin/Int| <kind=UNKNOWN>  {
     R|<local>/a|.R|kotlin/String.length|
     R|<local>/b|.<Unresolved name: length>#
     ^ this@R|/<anonymous>|.R|/<anonymous>.baz|()
 }
 )"];
-        118 [label="Stub" style="filled" fillcolor=gray];
-        113 [label="Exit function bar" style="filled" fillcolor=red];
+            138 [label="Stub" style="filled" fillcolor=gray];
+            139 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        140 [label="Exit function bar" style="filled" fillcolor=red];
     }
-    112 -> {114};
-    114 -> {119};
-    114 -> {115} [color=red];
-    115 -> {116};
-    116 -> {117};
-    117 -> {113};
-    117 -> {118} [style=dotted];
-    118 -> {113} [style=dotted];
-    119 -> {120 121};
-    120 -> {119};
-    120 -> {115} [color=green];
-    121 -> {122};
-    122 -> {123};
-    123 -> {124};
-    124 -> {125};
-    125 -> {120};
+    132 -> {133};
+    133 -> {134};
+    134 -> {141};
+    134 -> {135} [color=red];
+    135 -> {136};
+    136 -> {137};
+    137 -> {140};
+    137 -> {138} [style=dotted];
+    138 -> {139} [style=dotted];
+    139 -> {140} [style=dotted];
+    141 -> {149 142};
+    142 -> {143};
+    143 -> {144};
+    144 -> {145};
+    145 -> {146};
+    146 -> {147};
+    147 -> {148};
+    148 -> {149};
+    149 -> {135} [color=green];
+    149 -> {141} [color=green style=dashed];
 
-    subgraph cluster_27 {
+    subgraph cluster_39 {
         color=red
-        126 [label="Enter function baz" style="filled" fillcolor=red];
-        128 [label="Const: Int(1)"];
-        129 [label="Jump: ^baz Int(1)"];
-        130 [label="Stub" style="filled" fillcolor=gray];
-        127 [label="Exit function baz" style="filled" fillcolor=red];
+        150 [label="Enter function baz" style="filled" fillcolor=red];
+        subgraph cluster_40 {
+            color=blue
+            151 [label="Enter block"];
+            152 [label="Const: Int(1)"];
+            153 [label="Jump: ^baz Int(1)"];
+            154 [label="Stub" style="filled" fillcolor=gray];
+            155 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        156 [label="Exit function baz" style="filled" fillcolor=red];
     }
-    126 -> {128};
-    128 -> {129};
-    129 -> {127};
-    129 -> {130} [style=dotted];
-    130 -> {127} [style=dotted];
-
-    subgraph cluster_28 {
-        color=red
-        131 [label="Enter class <anonymous>" style="filled" fillcolor=red];
-        132 [label="Exit class <anonymous>" style="filled" fillcolor=red];
-    }
-    131 -> {132} [color=green];
+    150 -> {151};
+    151 -> {152};
+    152 -> {153};
+    153 -> {156};
+    153 -> {154} [style=dotted];
+    154 -> {155} [style=dotted];
+    155 -> {156} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/loops.dot

@@ -8,82 +8,93 @@ digraph loops_kt {
         0 [label="Enter function testWhile" style="filled" fillcolor=red];
         subgraph cluster_1 {
             color=blue
-            2 [label="Enter while loop"];
+            1 [label="Enter block"];
             subgraph cluster_2 {
                 color=blue
-                4 [label="Enter loop condition"];
-                5 [label="Access variable R|<local>/b|"];
-                6 [label="Exit loop condition"];
-            }
-            subgraph cluster_3 {
-                color=blue
-                7 [label="Enter loop block"];
+                2 [label="Enter while loop"];
+                subgraph cluster_3 {
+                    color=blue
+                    3 [label="Enter loop condition"];
+                    4 [label="Access variable R|<local>/b|"];
+                    5 [label="Exit loop condition"];
+                }
                 subgraph cluster_4 {
                     color=blue
-                    8 [label="Enter block"];
-                    9 [label="Access variable R|<local>/x|"];
-                    10 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-                    11 [label="Variable declaration: lval y: R|kotlin/Boolean|"];
-                    12 [label="Exit block"];
+                    6 [label="Enter loop block"];
+                    subgraph cluster_5 {
+                        color=blue
+                        7 [label="Enter block"];
+                        8 [label="Access variable R|<local>/x|"];
+                        9 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+                        10 [label="Variable declaration: lval y: R|kotlin/Boolean|"];
+                        11 [label="Exit block"];
+                    }
+                    12 [label="Exit loop block"];
                 }
-                13 [label="Exit loop block"];
+                13 [label="Exit whileloop"];
             }
-            3 [label="Exit whileloop"];
+            14 [label="Access variable R|<local>/x|"];
+            15 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+            16 [label="Exit block"];
         }
-        14 [label="Access variable R|<local>/x|"];
-        15 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-        1 [label="Exit function testWhile" style="filled" fillcolor=red];
+        17 [label="Exit function testWhile" style="filled" fillcolor=red];
     }
-    0 -> {2};
-    2 -> {4};
-    3 -> {14};
+    0 -> {1};
+    1 -> {2};
+    2 -> {3};
+    3 -> {4};
     4 -> {5};
-    5 -> {6};
-    6 -> {3 7};
+    5 -> {13 6};
+    6 -> {7};
     7 -> {8};
     8 -> {9};
     9 -> {10};
     10 -> {11};
     11 -> {12};
-    12 -> {13};
-    13 -> {4};
+    12 -> {3} [color=green style=dashed];
+    13 -> {14};
     14 -> {15};
-    15 -> {1};
+    15 -> {16};
+    16 -> {17};
 
-    subgraph cluster_5 {
+    subgraph cluster_6 {
         color=red
-        16 [label="Enter function testDoWhile" style="filled" fillcolor=red];
-        subgraph cluster_6 {
+        18 [label="Enter function testDoWhile" style="filled" fillcolor=red];
+        subgraph cluster_7 {
             color=blue
-            18 [label="Enter do-while loop"];
-            subgraph cluster_7 {
+            19 [label="Enter block"];
+            subgraph cluster_8 {
                 color=blue
-                20 [label="Enter loop block"];
-                subgraph cluster_8 {
+                20 [label="Enter do-while loop"];
+                subgraph cluster_9 {
                     color=blue
-                    21 [label="Enter block"];
-                    22 [label="Access variable R|<local>/x|"];
-                    23 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-                    24 [label="Variable declaration: lval y: R|kotlin/Boolean|"];
-                    25 [label="Exit block"];
+                    21 [label="Enter loop block"];
+                    subgraph cluster_10 {
+                        color=blue
+                        22 [label="Enter block"];
+                        23 [label="Access variable R|<local>/x|"];
+                        24 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+                        25 [label="Variable declaration: lval y: R|kotlin/Boolean|"];
+                        26 [label="Exit block"];
+                    }
+                    27 [label="Exit loop block"];
                 }
-                26 [label="Exit loop block"];
+                subgraph cluster_11 {
+                    color=blue
+                    28 [label="Enter loop condition"];
+                    29 [label="Access variable R|<local>/b|"];
+                    30 [label="Exit loop condition"];
+                }
+                31 [label="Exit do-whileloop"];
             }
-            subgraph cluster_9 {
-                color=blue
-                27 [label="Enter loop condition"];
-                28 [label="Access variable R|<local>/b|"];
-                29 [label="Exit loop condition"];
-            }
-            19 [label="Exit do-whileloop"];
+            32 [label="Access variable R|<local>/x|"];
+            33 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+            34 [label="Exit block"];
         }
-        30 [label="Access variable R|<local>/x|"];
-        31 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-        17 [label="Exit function testDoWhile" style="filled" fillcolor=red];
+        35 [label="Exit function testDoWhile" style="filled" fillcolor=red];
     }
-    16 -> {18};
-    18 -> {20};
-    19 -> {30};
+    18 -> {19};
+    19 -> {20};
     20 -> {21};
     21 -> {22};
     22 -> {23};
@@ -93,389 +104,442 @@ digraph loops_kt {
     26 -> {27};
     27 -> {28};
     28 -> {29};
-    29 -> {20 19};
+    29 -> {30};
     30 -> {31};
-    31 -> {17};
-
-    subgraph cluster_10 {
-        color=red
-        32 [label="Enter function testFor" style="filled" fillcolor=red];
-        34 [label="Const: Int(0)"];
-        35 [label="Const: Int(5)"];
-        36 [label="Function call: Int(0).R|kotlin/Int.rangeTo|(...)"];
-        37 [label="Function call: Int(0).R|kotlin/Int.rangeTo|(...).R|kotlin/ranges/IntProgression.iterator|()"];
-        38 [label="Variable declaration: lval <iterator>: R|kotlin/collections/IntIterator|"];
-        subgraph cluster_11 {
-            color=blue
-            39 [label="Enter while loop"];
-            subgraph cluster_12 {
-                color=blue
-                41 [label="Enter loop condition"];
-                42 [label="Access variable R|<local>/<iterator>|"];
-                43 [label="Function call: R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()"];
-                44 [label="Exit loop condition"];
-            }
-            subgraph cluster_13 {
-                color=blue
-                45 [label="Enter loop block"];
-                subgraph cluster_14 {
-                    color=blue
-                    46 [label="Enter block"];
-                    47 [label="Access variable R|<local>/<iterator>|"];
-                    48 [label="Function call: R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()"];
-                    49 [label="Variable declaration: lval i: R|kotlin/Int|"];
-                    50 [label="Access variable R|<local>/x|"];
-                    51 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-                    52 [label="Variable declaration: lval y: R|kotlin/Boolean|"];
-                    53 [label="Exit block"];
-                }
-                54 [label="Exit loop block"];
-            }
-            40 [label="Exit whileloop"];
-        }
-        55 [label="Access variable R|<local>/x|"];
-        56 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
-        33 [label="Exit function testFor" style="filled" fillcolor=red];
-    }
-    32 -> {34};
+    30 -> {21} [color=green style=dashed];
+    31 -> {32};
+    32 -> {33};
+    33 -> {34};
     34 -> {35};
-    35 -> {36};
+
+    subgraph cluster_12 {
+        color=red
+        36 [label="Enter function testFor" style="filled" fillcolor=red];
+        subgraph cluster_13 {
+            color=blue
+            37 [label="Enter block"];
+            38 [label="Const: Int(0)"];
+            39 [label="Const: Int(5)"];
+            40 [label="Function call: Int(0).R|kotlin/Int.rangeTo|(...)"];
+            41 [label="Function call: Int(0).R|kotlin/Int.rangeTo|(...).R|kotlin/ranges/IntProgression.iterator|()"];
+            42 [label="Variable declaration: lval <iterator>: R|kotlin/collections/IntIterator|"];
+            subgraph cluster_14 {
+                color=blue
+                43 [label="Enter while loop"];
+                subgraph cluster_15 {
+                    color=blue
+                    44 [label="Enter loop condition"];
+                    45 [label="Access variable R|<local>/<iterator>|"];
+                    46 [label="Function call: R|<local>/<iterator>|.R|kotlin/collections/Iterator.hasNext|()"];
+                    47 [label="Exit loop condition"];
+                }
+                subgraph cluster_16 {
+                    color=blue
+                    48 [label="Enter loop block"];
+                    subgraph cluster_17 {
+                        color=blue
+                        49 [label="Enter block"];
+                        50 [label="Access variable R|<local>/<iterator>|"];
+                        51 [label="Function call: R|<local>/<iterator>|.R|kotlin/collections/IntIterator.next|()"];
+                        52 [label="Variable declaration: lval i: R|kotlin/Int|"];
+                        53 [label="Access variable R|<local>/x|"];
+                        54 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+                        55 [label="Variable declaration: lval y: R|kotlin/Boolean|"];
+                        56 [label="Exit block"];
+                    }
+                    57 [label="Exit loop block"];
+                }
+                58 [label="Exit whileloop"];
+            }
+            59 [label="Access variable R|<local>/x|"];
+            60 [label="Type operator: (R|<local>/x| is R|kotlin/String|)"];
+            61 [label="Exit block"];
+        }
+        62 [label="Exit function testFor" style="filled" fillcolor=red];
+    }
     36 -> {37};
     37 -> {38};
     38 -> {39};
-    39 -> {41};
-    40 -> {55};
+    39 -> {40};
+    40 -> {41};
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {40 45};
+    44 -> {45};
     45 -> {46};
     46 -> {47};
-    47 -> {48};
+    47 -> {58 48};
     48 -> {49};
     49 -> {50};
     50 -> {51};
     51 -> {52};
     52 -> {53};
     53 -> {54};
-    54 -> {41};
+    54 -> {55};
     55 -> {56};
-    56 -> {33};
-
-    subgraph cluster_15 {
-        color=red
-        57 [label="Enter function testWhileTrue" style="filled" fillcolor=red];
-        subgraph cluster_16 {
-            color=blue
-            59 [label="Enter while loop"];
-            subgraph cluster_17 {
-                color=blue
-                61 [label="Enter loop condition"];
-                62 [label="Const: Boolean(true)"];
-                63 [label="Exit loop condition"];
-            }
-            subgraph cluster_18 {
-                color=blue
-                64 [label="Enter loop block"];
-                subgraph cluster_19 {
-                    color=blue
-                    65 [label="Enter block"];
-                    66 [label="Const: Int(1)"];
-                    67 [label="Exit block"];
-                }
-                68 [label="Exit loop block"];
-            }
-            60 [label="Exit whileloop" style="filled" fillcolor=gray];
-        }
-        69 [label="Const: Int(1)" style="filled" fillcolor=gray];
-        58 [label="Exit function testWhileTrue" style="filled" fillcolor=red style="filled" fillcolor=gray];
-    }
-    57 -> {59};
-    59 -> {61};
-    60 -> {69} [style=dotted];
+    56 -> {57};
+    57 -> {44} [color=green style=dashed];
+    58 -> {59};
+    59 -> {60};
+    60 -> {61};
     61 -> {62};
-    62 -> {63};
+
+    subgraph cluster_18 {
+        color=red
+        63 [label="Enter function testWhileTrue" style="filled" fillcolor=red];
+        subgraph cluster_19 {
+            color=blue
+            64 [label="Enter block"];
+            subgraph cluster_20 {
+                color=blue
+                65 [label="Enter while loop"];
+                subgraph cluster_21 {
+                    color=blue
+                    66 [label="Enter loop condition"];
+                    67 [label="Const: Boolean(true)"];
+                    68 [label="Exit loop condition"];
+                }
+                subgraph cluster_22 {
+                    color=blue
+                    69 [label="Enter loop block"];
+                    subgraph cluster_23 {
+                        color=blue
+                        70 [label="Enter block"];
+                        71 [label="Const: Int(1)"];
+                        72 [label="Exit block"];
+                    }
+                    73 [label="Exit loop block"];
+                }
+                74 [label="Exit whileloop" style="filled" fillcolor=gray];
+            }
+            75 [label="Const: Int(1)" style="filled" fillcolor=gray];
+            76 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        77 [label="Exit function testWhileTrue" style="filled" fillcolor=red style="filled" fillcolor=gray];
+    }
     63 -> {64};
-    63 -> {60} [style=dotted];
     64 -> {65};
     65 -> {66};
     66 -> {67};
     67 -> {68};
-    68 -> {61};
-    69 -> {58} [style=dotted];
+    68 -> {69};
+    68 -> {74} [style=dotted];
+    69 -> {70};
+    70 -> {71};
+    71 -> {72};
+    72 -> {73};
+    73 -> {66} [color=green style=dashed];
+    74 -> {75} [style=dotted];
+    75 -> {76} [style=dotted];
+    76 -> {77} [style=dotted];
 
-    subgraph cluster_20 {
+    subgraph cluster_24 {
         color=red
-        70 [label="Enter function testWhileTrueWithBreak" style="filled" fillcolor=red];
-        subgraph cluster_21 {
+        78 [label="Enter function testWhileTrueWithBreak" style="filled" fillcolor=red];
+        subgraph cluster_25 {
             color=blue
-            72 [label="Enter while loop"];
-            subgraph cluster_22 {
+            79 [label="Enter block"];
+            subgraph cluster_26 {
                 color=blue
-                74 [label="Enter loop condition"];
-                75 [label="Const: Boolean(true)"];
-                76 [label="Exit loop condition"];
-            }
-            subgraph cluster_23 {
-                color=blue
-                77 [label="Enter loop block"];
-                subgraph cluster_24 {
+                80 [label="Enter while loop"];
+                subgraph cluster_27 {
                     color=blue
-                    78 [label="Enter block"];
-                    subgraph cluster_25 {
-                        color=blue
-                        79 [label="Enter when"];
-                        subgraph cluster_26 {
-                            color=blue
-                            81 [label="Enter when branch condition "];
-                            82 [label="Access variable R|<local>/b|"];
-                            83 [label="Exit when branch condition"];
-                        }
-                        90 [label="Synthetic else branch"];
-                        84 [label="Enter when branch result"];
-                        subgraph cluster_27 {
-                            color=blue
-                            85 [label="Enter block"];
-                            86 [label="Jump: break@@@[Boolean(true)] "];
-                            87 [label="Stub" style="filled" fillcolor=gray];
-                            88 [label="Exit block" style="filled" fillcolor=gray];
-                        }
-                        89 [label="Exit when branch result" style="filled" fillcolor=gray];
-                        80 [label="Exit when"];
-                    }
-                    91 [label="Exit block"];
+                    81 [label="Enter loop condition"];
+                    82 [label="Const: Boolean(true)"];
+                    83 [label="Exit loop condition"];
                 }
-                92 [label="Exit loop block"];
+                subgraph cluster_28 {
+                    color=blue
+                    84 [label="Enter loop block"];
+                    subgraph cluster_29 {
+                        color=blue
+                        85 [label="Enter block"];
+                        subgraph cluster_30 {
+                            color=blue
+                            86 [label="Enter when"];
+                            subgraph cluster_31 {
+                                color=blue
+                                87 [label="Enter when branch condition "];
+                                88 [label="Access variable R|<local>/b|"];
+                                89 [label="Exit when branch condition"];
+                            }
+                            90 [label="Synthetic else branch"];
+                            91 [label="Enter when branch result"];
+                            subgraph cluster_32 {
+                                color=blue
+                                92 [label="Enter block"];
+                                93 [label="Jump: break@@@[Boolean(true)] "];
+                                94 [label="Stub" style="filled" fillcolor=gray];
+                                95 [label="Exit block" style="filled" fillcolor=gray];
+                            }
+                            96 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            97 [label="Exit when"];
+                        }
+                        98 [label="Exit block"];
+                    }
+                    99 [label="Exit loop block"];
+                }
+                100 [label="Exit whileloop"];
             }
-            73 [label="Exit whileloop"];
+            101 [label="Const: Int(1)"];
+            102 [label="Exit block"];
         }
-        93 [label="Const: Int(1)"];
-        71 [label="Exit function testWhileTrueWithBreak" style="filled" fillcolor=red];
+        103 [label="Exit function testWhileTrueWithBreak" style="filled" fillcolor=red];
     }
-    70 -> {72};
-    72 -> {74};
-    73 -> {93};
-    74 -> {75};
-    75 -> {76};
-    76 -> {77};
-    76 -> {73} [style=dotted];
-    77 -> {78};
     78 -> {79};
-    79 -> {81};
-    80 -> {91};
+    79 -> {80};
+    80 -> {81};
     81 -> {82};
     82 -> {83};
-    83 -> {84 90};
+    83 -> {84};
+    83 -> {100} [style=dotted];
     84 -> {85};
     85 -> {86};
-    86 -> {73};
-    86 -> {87} [style=dotted];
-    87 -> {88} [style=dotted];
-    88 -> {89} [style=dotted];
-    89 -> {80} [style=dotted];
-    90 -> {80};
+    86 -> {87};
+    87 -> {88};
+    88 -> {89};
+    89 -> {91 90};
+    90 -> {97};
     91 -> {92};
-    92 -> {74};
-    93 -> {71};
-
-    subgraph cluster_28 {
-        color=red
-        94 [label="Enter function testWhileFalse" style="filled" fillcolor=red];
-        subgraph cluster_29 {
-            color=blue
-            96 [label="Enter while loop"];
-            subgraph cluster_30 {
-                color=blue
-                98 [label="Enter loop condition"];
-                99 [label="Const: Boolean(false)"];
-                100 [label="Exit loop condition"];
-            }
-            subgraph cluster_31 {
-                color=blue
-                101 [label="Enter loop block" style="filled" fillcolor=gray];
-                subgraph cluster_32 {
-                    color=blue
-                    102 [label="Enter block" style="filled" fillcolor=gray];
-                    103 [label="Const: Int(1)" style="filled" fillcolor=gray];
-                    104 [label="Exit block" style="filled" fillcolor=gray];
-                }
-                105 [label="Exit loop block" style="filled" fillcolor=gray];
-            }
-            97 [label="Exit whileloop"];
-        }
-        106 [label="Const: Int(1)"];
-        95 [label="Exit function testWhileFalse" style="filled" fillcolor=red];
-    }
-    94 -> {96};
-    96 -> {98};
-    97 -> {106};
+    92 -> {93};
+    93 -> {100};
+    93 -> {94} [style=dotted];
+    94 -> {95} [style=dotted];
+    95 -> {96} [style=dotted];
+    96 -> {97} [style=dotted];
+    97 -> {98};
     98 -> {99};
-    99 -> {100};
-    100 -> {97};
-    100 -> {101} [style=dotted];
-    101 -> {102} [style=dotted];
-    102 -> {103} [style=dotted];
-    103 -> {104} [style=dotted];
-    104 -> {105} [style=dotted];
-    105 -> {98} [style=dotted];
-    106 -> {95};
+    99 -> {81} [color=green style=dashed];
+    100 -> {101};
+    101 -> {102};
+    102 -> {103};
 
     subgraph cluster_33 {
         color=red
-        107 [label="Enter function testDoWhileTrue" style="filled" fillcolor=red];
+        104 [label="Enter function testWhileFalse" style="filled" fillcolor=red];
         subgraph cluster_34 {
             color=blue
-            109 [label="Enter do-while loop"];
+            105 [label="Enter block"];
             subgraph cluster_35 {
                 color=blue
-                111 [label="Enter loop block"];
+                106 [label="Enter while loop"];
                 subgraph cluster_36 {
                     color=blue
-                    112 [label="Enter block"];
-                    113 [label="Const: Int(1)"];
-                    114 [label="Exit block"];
+                    107 [label="Enter loop condition"];
+                    108 [label="Const: Boolean(false)"];
+                    109 [label="Exit loop condition"];
                 }
-                115 [label="Exit loop block"];
+                subgraph cluster_37 {
+                    color=blue
+                    110 [label="Enter loop block" style="filled" fillcolor=gray];
+                    subgraph cluster_38 {
+                        color=blue
+                        111 [label="Enter block" style="filled" fillcolor=gray];
+                        112 [label="Const: Int(1)" style="filled" fillcolor=gray];
+                        113 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    114 [label="Exit loop block" style="filled" fillcolor=gray];
+                }
+                115 [label="Exit whileloop"];
             }
-            subgraph cluster_37 {
-                color=blue
-                116 [label="Enter loop condition"];
-                117 [label="Const: Boolean(true)"];
-                118 [label="Exit loop condition"];
-            }
-            110 [label="Exit do-whileloop" style="filled" fillcolor=gray];
+            116 [label="Const: Int(1)"];
+            117 [label="Exit block"];
         }
-        119 [label="Const: Int(1)" style="filled" fillcolor=gray];
-        108 [label="Exit function testDoWhileTrue" style="filled" fillcolor=red style="filled" fillcolor=gray];
+        118 [label="Exit function testWhileFalse" style="filled" fillcolor=red];
     }
-    107 -> {109};
-    109 -> {111};
-    110 -> {119} [style=dotted];
-    111 -> {112};
-    112 -> {113};
-    113 -> {114};
-    114 -> {115};
+    104 -> {105};
+    105 -> {106};
+    106 -> {107};
+    107 -> {108};
+    108 -> {109};
+    109 -> {115};
+    109 -> {110} [style=dotted];
+    110 -> {111} [style=dotted];
+    111 -> {112} [style=dotted];
+    112 -> {113} [style=dotted];
+    113 -> {114} [style=dotted];
+    114 -> {107} [color=green style=dotted];
     115 -> {116};
     116 -> {117};
     117 -> {118};
-    118 -> {111};
-    118 -> {110} [style=dotted];
-    119 -> {108} [style=dotted];
 
-    subgraph cluster_38 {
+    subgraph cluster_39 {
         color=red
-        120 [label="Enter function testDoWhileTrueWithBreak" style="filled" fillcolor=red];
-        subgraph cluster_39 {
+        119 [label="Enter function testDoWhileTrue" style="filled" fillcolor=red];
+        subgraph cluster_40 {
             color=blue
-            122 [label="Enter do-while loop"];
-            subgraph cluster_40 {
+            120 [label="Enter block"];
+            subgraph cluster_41 {
                 color=blue
-                124 [label="Enter loop block"];
-                subgraph cluster_41 {
+                121 [label="Enter do-while loop"];
+                subgraph cluster_42 {
                     color=blue
-                    125 [label="Enter block"];
-                    subgraph cluster_42 {
+                    122 [label="Enter loop block"];
+                    subgraph cluster_43 {
                         color=blue
-                        126 [label="Enter when"];
-                        subgraph cluster_43 {
-                            color=blue
-                            128 [label="Enter when branch condition "];
-                            129 [label="Access variable R|<local>/b|"];
-                            130 [label="Exit when branch condition"];
-                        }
-                        137 [label="Synthetic else branch"];
-                        131 [label="Enter when branch result"];
-                        subgraph cluster_44 {
-                            color=blue
-                            132 [label="Enter block"];
-                            133 [label="Jump: break@@@[Boolean(true)] "];
-                            134 [label="Stub" style="filled" fillcolor=gray];
-                            135 [label="Exit block" style="filled" fillcolor=gray];
-                        }
-                        136 [label="Exit when branch result" style="filled" fillcolor=gray];
-                        127 [label="Exit when"];
+                        123 [label="Enter block"];
+                        124 [label="Const: Int(1)"];
+                        125 [label="Exit block"];
                     }
-                    138 [label="Exit block"];
+                    126 [label="Exit loop block"];
                 }
-                139 [label="Exit loop block"];
+                subgraph cluster_44 {
+                    color=blue
+                    127 [label="Enter loop condition"];
+                    128 [label="Const: Boolean(true)"];
+                    129 [label="Exit loop condition"];
+                }
+                130 [label="Exit do-whileloop" style="filled" fillcolor=gray];
             }
-            subgraph cluster_45 {
-                color=blue
-                140 [label="Enter loop condition"];
-                141 [label="Const: Boolean(true)"];
-                142 [label="Exit loop condition"];
-            }
-            123 [label="Exit do-whileloop"];
+            131 [label="Const: Int(1)" style="filled" fillcolor=gray];
+            132 [label="Exit block" style="filled" fillcolor=gray];
         }
-        143 [label="Const: Int(1)"];
-        121 [label="Exit function testDoWhileTrueWithBreak" style="filled" fillcolor=red];
+        133 [label="Exit function testDoWhileTrue" style="filled" fillcolor=red style="filled" fillcolor=gray];
     }
-    120 -> {122};
-    122 -> {124};
-    123 -> {143};
+    119 -> {120};
+    120 -> {121};
+    121 -> {122};
+    122 -> {123};
+    123 -> {124};
     124 -> {125};
     125 -> {126};
-    126 -> {128};
-    127 -> {138};
+    126 -> {127};
+    127 -> {128};
     128 -> {129};
-    129 -> {130};
-    130 -> {131 137};
-    131 -> {132};
-    132 -> {133};
-    133 -> {123};
-    133 -> {134} [style=dotted];
-    134 -> {135} [style=dotted];
-    135 -> {136} [style=dotted];
-    136 -> {127} [style=dotted];
-    137 -> {127};
+    129 -> {130} [style=dotted];
+    129 -> {122} [color=green style=dashed];
+    130 -> {131} [style=dotted];
+    131 -> {132} [style=dotted];
+    132 -> {133} [style=dotted];
+
+    subgraph cluster_45 {
+        color=red
+        134 [label="Enter function testDoWhileTrueWithBreak" style="filled" fillcolor=red];
+        subgraph cluster_46 {
+            color=blue
+            135 [label="Enter block"];
+            subgraph cluster_47 {
+                color=blue
+                136 [label="Enter do-while loop"];
+                subgraph cluster_48 {
+                    color=blue
+                    137 [label="Enter loop block"];
+                    subgraph cluster_49 {
+                        color=blue
+                        138 [label="Enter block"];
+                        subgraph cluster_50 {
+                            color=blue
+                            139 [label="Enter when"];
+                            subgraph cluster_51 {
+                                color=blue
+                                140 [label="Enter when branch condition "];
+                                141 [label="Access variable R|<local>/b|"];
+                                142 [label="Exit when branch condition"];
+                            }
+                            143 [label="Synthetic else branch"];
+                            144 [label="Enter when branch result"];
+                            subgraph cluster_52 {
+                                color=blue
+                                145 [label="Enter block"];
+                                146 [label="Jump: break@@@[Boolean(true)] "];
+                                147 [label="Stub" style="filled" fillcolor=gray];
+                                148 [label="Exit block" style="filled" fillcolor=gray];
+                            }
+                            149 [label="Exit when branch result" style="filled" fillcolor=gray];
+                            150 [label="Exit when"];
+                        }
+                        151 [label="Exit block"];
+                    }
+                    152 [label="Exit loop block"];
+                }
+                subgraph cluster_53 {
+                    color=blue
+                    153 [label="Enter loop condition"];
+                    154 [label="Const: Boolean(true)"];
+                    155 [label="Exit loop condition"];
+                }
+                156 [label="Exit do-whileloop"];
+            }
+            157 [label="Const: Int(1)"];
+            158 [label="Exit block"];
+        }
+        159 [label="Exit function testDoWhileTrueWithBreak" style="filled" fillcolor=red];
+    }
+    134 -> {135};
+    135 -> {136};
+    136 -> {137};
+    137 -> {138};
     138 -> {139};
     139 -> {140};
     140 -> {141};
     141 -> {142};
-    142 -> {124};
-    142 -> {123} [style=dotted];
-    143 -> {121};
-
-    subgraph cluster_46 {
-        color=red
-        144 [label="Enter function testDoWhileFalse" style="filled" fillcolor=red];
-        subgraph cluster_47 {
-            color=blue
-            146 [label="Enter do-while loop"];
-            subgraph cluster_48 {
-                color=blue
-                148 [label="Enter loop block"];
-                subgraph cluster_49 {
-                    color=blue
-                    149 [label="Enter block"];
-                    150 [label="Const: Int(1)"];
-                    151 [label="Exit block"];
-                }
-                152 [label="Exit loop block"];
-            }
-            subgraph cluster_50 {
-                color=blue
-                153 [label="Enter loop condition"];
-                154 [label="Const: Boolean(false)"];
-                155 [label="Exit loop condition"];
-            }
-            147 [label="Exit do-whileloop"];
-        }
-        156 [label="Const: Int(1)"];
-        145 [label="Exit function testDoWhileFalse" style="filled" fillcolor=red];
-    }
-    144 -> {146};
-    146 -> {148};
-    147 -> {156};
-    148 -> {149};
-    149 -> {150};
+    142 -> {144 143};
+    143 -> {150};
+    144 -> {145};
+    145 -> {146};
+    146 -> {156};
+    146 -> {147} [style=dotted];
+    147 -> {148} [style=dotted];
+    148 -> {149} [style=dotted];
+    149 -> {150} [style=dotted];
     150 -> {151};
     151 -> {152};
     152 -> {153};
     153 -> {154};
     154 -> {155};
-    155 -> {147};
-    155 -> {148} [style=dotted];
-    156 -> {145};
+    155 -> {156} [style=dotted];
+    155 -> {137} [color=green style=dashed];
+    156 -> {157};
+    157 -> {158};
+    158 -> {159};
+
+    subgraph cluster_54 {
+        color=red
+        160 [label="Enter function testDoWhileFalse" style="filled" fillcolor=red];
+        subgraph cluster_55 {
+            color=blue
+            161 [label="Enter block"];
+            subgraph cluster_56 {
+                color=blue
+                162 [label="Enter do-while loop"];
+                subgraph cluster_57 {
+                    color=blue
+                    163 [label="Enter loop block"];
+                    subgraph cluster_58 {
+                        color=blue
+                        164 [label="Enter block"];
+                        165 [label="Const: Int(1)"];
+                        166 [label="Exit block"];
+                    }
+                    167 [label="Exit loop block"];
+                }
+                subgraph cluster_59 {
+                    color=blue
+                    168 [label="Enter loop condition"];
+                    169 [label="Const: Boolean(false)"];
+                    170 [label="Exit loop condition"];
+                }
+                171 [label="Exit do-whileloop"];
+            }
+            172 [label="Const: Int(1)"];
+            173 [label="Exit block"];
+        }
+        174 [label="Exit function testDoWhileFalse" style="filled" fillcolor=red];
+    }
+    160 -> {161};
+    161 -> {162};
+    162 -> {163};
+    163 -> {164};
+    164 -> {165};
+    165 -> {166};
+    166 -> {167};
+    167 -> {168};
+    168 -> {169};
+    169 -> {170};
+    170 -> {171};
+    170 -> {163} [color=green style=dotted];
+    171 -> {172};
+    172 -> {173};
+    173 -> {174};
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.dot

@@ -5,90 +5,111 @@ digraph postponedLambdaInConstructor_kt {
 
     subgraph cluster_0 {
         color=red
-        0 [label="Enter function <init>" style="filled" fillcolor=red];
-        2 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        1 [label="Exit function <init>" style="filled" fillcolor=red];
+        0 [label="Enter class A" style="filled" fillcolor=red];
+        1 [label="Exit class A" style="filled" fillcolor=red];
     }
-    0 -> {2};
-    2 -> {1};
+    0 -> {1} [color=green];
 
     subgraph cluster_1 {
         color=red
-        3 [label="Enter class A" style="filled" fillcolor=red];
-        4 [label="Exit class A" style="filled" fillcolor=red];
+        2 [label="Enter function <init>" style="filled" fillcolor=red];
+        3 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        4 [label="Exit function <init>" style="filled" fillcolor=red];
     }
-    3 -> {4} [color=green];
+    2 -> {3};
+    3 -> {4};
 
     subgraph cluster_2 {
         color=red
-        5 [label="Enter function <init>" style="filled" fillcolor=red];
-        7 [label="Access variable R|<local>/s|"];
-        8 [label="Postponed enter to lambda"];
+        5 [label="Enter class B" style="filled" fillcolor=red];
         subgraph cluster_3 {
             color=blue
-            13 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            15 [label="Postponed enter to lambda"];
-            subgraph cluster_4 {
-                color=blue
-                17 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-                19 [label="Access variable R|<local>/it|"];
-                18 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-            }
-            16 [label="Postponed exit from lambda"];
-            14 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            7 [label="Enter property" style="filled" fillcolor=red];
+            8 [label="Access variable R|<local>/s|"];
+            9 [label="Exit property" style="filled" fillcolor=red];
         }
-        9 [label="Postponed exit from lambda"];
-        10 [label="Function call: R|<local>/s|.R|kotlin/let|<R|kotlin/String|, R|() -> kotlin/String|>(...)"];
-        12 [label="Call arguments union" style="filled" fillcolor=yellow];
-        11 [label="Delegated constructor call: super<R|A|>(...)"];
-        6 [label="Exit function <init>" style="filled" fillcolor=red];
+        6 [label="Exit class B" style="filled" fillcolor=red];
     }
-    5 -> {7};
+    5 -> {7} [color=green];
     7 -> {8};
-    8 -> {13};
-    8 -> {9} [color=red];
-    9 -> {10};
-    10 -> {12};
-    11 -> {6};
-    12 -> {11};
-    13 -> {15};
-    14 -> {9} [color=green];
-    14 -> {12} [color=red];
+    8 -> {9};
+    9 -> {6} [color=green];
+
+    subgraph cluster_4 {
+        color=red
+        10 [label="Enter function <init>" style="filled" fillcolor=red];
+        11 [label="Access variable R|<local>/s|"];
+        12 [label="Postponed enter to lambda"];
+        subgraph cluster_5 {
+            color=blue
+            18 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+            subgraph cluster_6 {
+                color=blue
+                19 [label="Enter block"];
+                20 [label="Postponed enter to lambda"];
+                subgraph cluster_7 {
+                    color=blue
+                    24 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                    subgraph cluster_8 {
+                        color=blue
+                        25 [label="Enter block"];
+                        26 [label="Access variable R|<local>/it|"];
+                        27 [label="Exit block"];
+                    }
+                    28 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+                }
+                21 [label="Postponed exit from lambda"];
+                22 [label="Exit block"];
+            }
+            23 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+        }
+        13 [label="Postponed exit from lambda"];
+        14 [label="Function call: R|<local>/s|.R|kotlin/let|<R|kotlin/String|, R|() -> kotlin/String|>(...)"];
+        15 [label="Call arguments union" style="filled" fillcolor=yellow];
+        16 [label="Delegated constructor call: super<R|A|>(...)"];
+        17 [label="Exit function <init>" style="filled" fillcolor=red];
+    }
+    10 -> {11};
+    11 -> {12};
+    12 -> {18};
+    12 -> {13} [color=red];
+    13 -> {14};
+    14 -> {15};
     15 -> {16};
-    15 -> {17} [color=red];
-    16 -> {14};
-    17 -> {19};
-    19 -> {18};
+    16 -> {17};
+    18 -> {19};
+    19 -> {20};
+    20 -> {21 24};
+    21 -> {22};
+    22 -> {23};
+    23 -> {15} [color=red];
+    23 -> {13} [color=green];
+    24 -> {25};
+    25 -> {26};
+    26 -> {27};
+    27 -> {28};
 
-    subgraph cluster_5 {
+    subgraph cluster_9 {
         color=red
-        25 [label="Enter function foo" style="filled" fillcolor=red];
-        27 [label="Function call: this@R|/B|.R|/B.foo|()"];
-        26 [label="Exit function foo" style="filled" fillcolor=red];
+        29 [label="Enter function getter" style="filled" fillcolor=red];
+        30 [label="Exit function getter" style="filled" fillcolor=red];
     }
-    25 -> {27};
-    27 -> {26};
+    29 -> {30};
 
-    subgraph cluster_6 {
+    subgraph cluster_10 {
         color=red
-        28 [label="Enter class B" style="filled" fillcolor=red];
-        subgraph cluster_7 {
+        31 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_11 {
             color=blue
-            20 [label="Enter function getter" style="filled" fillcolor=red];
-            21 [label="Exit function getter" style="filled" fillcolor=red];
+            32 [label="Enter block"];
+            33 [label="Function call: this@R|/B|.R|/B.foo|()"];
+            34 [label="Exit block"];
         }
-        subgraph cluster_8 {
-            color=blue
-            22 [label="Enter property" style="filled" fillcolor=red];
-            24 [label="Access variable R|<local>/s|"];
-            23 [label="Exit property" style="filled" fillcolor=red];
-        }
-        29 [label="Exit class B" style="filled" fillcolor=red];
+        35 [label="Exit function foo" style="filled" fillcolor=red];
     }
-    28 -> {22} [color=green];
-    22 -> {24};
-    23 -> {29} [color=green];
-    24 -> {23};
-    20 -> {21};
+    31 -> {32};
+    32 -> {33};
+    33 -> {34};
+    34 -> {35};
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdas.dot

@@ -6,36 +6,57 @@ digraph postponedLambdas_kt {
     subgraph cluster_0 {
         color=red
         0 [label="Enter function foo" style="filled" fillcolor=red];
-        1 [label="Exit function foo" style="filled" fillcolor=red];
+        subgraph cluster_1 {
+            color=blue
+            1 [label="Enter block"];
+            2 [label="Exit block"];
+        }
+        3 [label="Exit function foo" style="filled" fillcolor=red];
     }
     0 -> {1};
+    1 -> {2};
+    2 -> {3};
 
-    subgraph cluster_1 {
+    subgraph cluster_2 {
         color=red
-        2 [label="Enter function test" style="filled" fillcolor=red];
-        4 [label="Access variable R|<local>/a|"];
-        5 [label="Postponed enter to lambda"];
-        subgraph cluster_2 {
+        4 [label="Enter function test" style="filled" fillcolor=red];
+        subgraph cluster_3 {
             color=blue
-            9 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            11 [label="Const: String()"];
-            10 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            5 [label="Enter block"];
+            6 [label="Access variable R|<local>/a|"];
+            7 [label="Postponed enter to lambda"];
+            subgraph cluster_4 {
+                color=blue
+                13 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_5 {
+                    color=blue
+                    14 [label="Enter block"];
+                    15 [label="Const: String()"];
+                    16 [label="Exit block"];
+                }
+                17 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            8 [label="Postponed exit from lambda"];
+            9 [label="Access variable R|<local>/b|"];
+            10 [label="Function call: R|/foo|(...)"];
+            11 [label="Exit block"];
         }
-        6 [label="Postponed exit from lambda"];
-        7 [label="Access variable R|<local>/b|"];
-        8 [label="Function call: R|/foo|(...)"];
-        3 [label="Exit function test" style="filled" fillcolor=red];
+        12 [label="Exit function test" style="filled" fillcolor=red];
     }
-    2 -> {4};
     4 -> {5};
-    5 -> {9};
-    5 -> {6} [color=red];
+    5 -> {6};
     6 -> {7};
-    7 -> {8};
-    8 -> {3};
-    9 -> {10 11};
-    10 -> {9};
-    10 -> {6} [color=green];
-    11 -> {10};
+    7 -> {13};
+    7 -> {8} [color=red];
+    8 -> {9};
+    9 -> {10};
+    10 -> {11};
+    11 -> {12};
+    13 -> {17 14};
+    14 -> {15};
+    15 -> {16};
+    16 -> {17};
+    17 -> {8} [color=green];
+    17 -> {13} [color=green style=dashed];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.dot

@@ -6,263 +6,309 @@ digraph propertiesAndInitBlocks_kt {
     subgraph cluster_0 {
         color=red
         0 [label="Enter function run" style="filled" fillcolor=red];
-        2 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
-        1 [label="Exit function run" style="filled" fillcolor=red];
-    }
-    0 -> {2};
-    2 -> {1};
-
-    subgraph cluster_1 {
-        color=red
-        5 [label="Enter property" style="filled" fillcolor=red];
-        subgraph cluster_2 {
+        subgraph cluster_1 {
             color=blue
-            3 [label="Enter function getter" style="filled" fillcolor=red];
-            4 [label="Exit function getter" style="filled" fillcolor=red];
+            1 [label="Enter block"];
+            2 [label="Function call: R|<local>/block|.R|FakeOverride<kotlin/Function0.invoke: R|kotlin/Unit|>|()"];
+            3 [label="Exit block"];
         }
-        7 [label="Const: Int(1)"];
-        6 [label="Exit property" style="filled" fillcolor=red];
+        4 [label="Exit function run" style="filled" fillcolor=red];
     }
-    5 -> {7};
-    7 -> {6};
+    0 -> {1};
+    1 -> {2};
+    2 -> {3};
     3 -> {4};
 
+    subgraph cluster_2 {
+        color=red
+        5 [label="Enter function getter" style="filled" fillcolor=red];
+        6 [label="Exit function getter" style="filled" fillcolor=red];
+    }
+    5 -> {6};
+
     subgraph cluster_3 {
         color=red
-        17 [label="Enter property" style="filled" fillcolor=red];
-        subgraph cluster_4 {
-            color=blue
-            13 [label="Enter function setter" style="filled" fillcolor=red];
-            15 [label="Const: Int(1)"];
-            16 [label="Assignment: F|/x2|"];
-            14 [label="Exit function setter" style="filled" fillcolor=red];
-        }
+        7 [label="Enter property" style="filled" fillcolor=red];
+        8 [label="Const: Int(1)"];
+        9 [label="Exit property" style="filled" fillcolor=red];
+    }
+    7 -> {8};
+    8 -> {9};
+
+    subgraph cluster_4 {
+        color=red
+        10 [label="Enter function getter" style="filled" fillcolor=red];
         subgraph cluster_5 {
             color=blue
-            8 [label="Enter function getter" style="filled" fillcolor=red];
-            10 [label="Const: Int(1)"];
-            11 [label="Jump: ^ Int(1)"];
-            12 [label="Stub" style="filled" fillcolor=gray];
-            9 [label="Exit function getter" style="filled" fillcolor=red];
+            11 [label="Enter block"];
+            12 [label="Const: Int(1)"];
+            13 [label="Jump: ^ Int(1)"];
+            14 [label="Stub" style="filled" fillcolor=gray];
+            15 [label="Exit block" style="filled" fillcolor=gray];
         }
-        19 [label="Const: Int(1)"];
-        18 [label="Exit property" style="filled" fillcolor=red];
+        16 [label="Exit function getter" style="filled" fillcolor=red];
     }
-    17 -> {19};
-    19 -> {18};
-    8 -> {10};
     10 -> {11};
-    11 -> {9};
-    11 -> {12} [style=dotted];
-    12 -> {9} [style=dotted];
-    13 -> {15};
-    15 -> {16};
-    16 -> {14};
+    11 -> {12};
+    12 -> {13};
+    13 -> {16};
+    13 -> {14} [style=dotted];
+    14 -> {15} [style=dotted];
+    15 -> {16} [style=dotted];
 
     subgraph cluster_6 {
         color=red
-        35 [label="Enter function <init>" style="filled" fillcolor=red];
-        37 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        36 [label="Exit function <init>" style="filled" fillcolor=red];
-    }
-    35 -> {37};
-    37 -> {36};
-
-    subgraph cluster_7 {
-        color=red
-        46 [label="Enter class LocalClass" style="filled" fillcolor=red];
-        subgraph cluster_8 {
+        17 [label="Enter function setter" style="filled" fillcolor=red];
+        subgraph cluster_7 {
             color=blue
-            38 [label="Enter init block" style="filled" fillcolor=red];
-            subgraph cluster_9 {
-                color=blue
-                40 [label="Enter block"];
-                41 [label="Function call: R|java/lang/Exception.Exception|()"];
-                42 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                43 [label="Stub" style="filled" fillcolor=gray];
-                44 [label="Const: Int(1)" style="filled" fillcolor=gray];
-                45 [label="Exit block" style="filled" fillcolor=gray];
-            }
-            39 [label="Exit init block" style="filled" fillcolor=red];
+            18 [label="Enter block"];
+            19 [label="Const: Int(1)"];
+            20 [label="Assignment: F|/x2|"];
+            21 [label="Exit block"];
         }
-        47 [label="Exit class LocalClass" style="filled" fillcolor=red];
+        22 [label="Exit function setter" style="filled" fillcolor=red];
     }
-    46 -> {38} [color=green];
-    38 -> {40};
-    39 -> {47} [color=green];
-    40 -> {41};
-    41 -> {42};
-    42 -> {39};
-    42 -> {43} [style=dotted];
-    43 -> {44} [style=dotted];
-    44 -> {45} [style=dotted];
-    45 -> {39} [style=dotted];
+    17 -> {18};
+    18 -> {19};
+    19 -> {20};
+    20 -> {21};
+    21 -> {22};
 
-    subgraph cluster_10 {
+    subgraph cluster_8 {
         color=red
-        51 [label="Enter function <init>" style="filled" fillcolor=red];
-        53 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        52 [label="Exit function <init>" style="filled" fillcolor=red];
+        23 [label="Enter property" style="filled" fillcolor=red];
+        24 [label="Const: Int(1)"];
+        25 [label="Exit property" style="filled" fillcolor=red];
     }
-    51 -> {53};
-    53 -> {52};
+    23 -> {24};
+    24 -> {25};
+
+    subgraph cluster_9 {
+        color=red
+        44 [label="Enter function foo" style="filled" fillcolor=red];
+        subgraph cluster_10 {
+            color=blue
+            45 [label="Enter block"];
+            46 [label="Const: Int(1)"];
+            47 [label="Const: Int(1)"];
+            48 [label="Function call: Int(1).R|kotlin/Int.plus|(...)"];
+            49 [label="Variable declaration: lval c: R|kotlin/Int|"];
+            50 [label="Function call: R|java/lang/Exception.Exception|()"];
+            51 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+            52 [label="Stub" style="filled" fillcolor=gray];
+            53 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        54 [label="Exit function foo" style="filled" fillcolor=red];
+    }
+    44 -> {45};
+    45 -> {46};
+    46 -> {47};
+    47 -> {48};
+    48 -> {49};
+    49 -> {50};
+    50 -> {51};
+    51 -> {54};
+    51 -> {52} [style=dotted];
+    52 -> {53} [style=dotted];
+    53 -> {54} [style=dotted];
 
     subgraph cluster_11 {
         color=red
-        61 [label="Enter class LocalClass" style="filled" fillcolor=red];
-        subgraph cluster_12 {
-            color=blue
-            54 [label="Enter init block" style="filled" fillcolor=red];
-            subgraph cluster_13 {
-                color=blue
-                56 [label="Enter block"];
-                57 [label="Function call: R|java/lang/Exception.Exception|()"];
-                58 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                59 [label="Stub" style="filled" fillcolor=gray];
-                60 [label="Exit block" style="filled" fillcolor=gray];
-            }
-            55 [label="Exit init block" style="filled" fillcolor=red];
-        }
-        62 [label="Exit class LocalClass" style="filled" fillcolor=red];
+        55 [label="Enter function <init>" style="filled" fillcolor=red];
+        56 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        57 [label="Exit function <init>" style="filled" fillcolor=red];
     }
-    61 -> {54} [color=green];
-    54 -> {56};
-    55 -> {62} [color=green];
+    55 -> {56};
     56 -> {57};
-    57 -> {58};
-    58 -> {55};
-    58 -> {59} [style=dotted];
-    59 -> {60} [style=dotted];
-    60 -> {55} [style=dotted];
 
-    subgraph cluster_14 {
+    subgraph cluster_12 {
         color=red
-        63 [label="Enter property" style="filled" fillcolor=red];
+        58 [label="Enter function getter" style="filled" fillcolor=red];
+        subgraph cluster_13 {
+            color=blue
+            63 [label="Enter class GetterLocalClass" style="filled" fillcolor=red];
+            subgraph cluster_14 {
+                color=blue
+                59 [label="Enter block"];
+                60 [label="Exit local class <getter>"];
+                61 [label="Exit block"];
+            }
+            62 [label="Exit function getter" style="filled" fillcolor=red];
+        }
         subgraph cluster_15 {
             color=blue
-            48 [label="Enter function getter" style="filled" fillcolor=red];
-            50 [label="Exit local class <getter>"];
-            49 [label="Exit function getter" style="filled" fillcolor=red];
-        }
-        65 [label="Postponed enter to lambda"];
-        subgraph cluster_16 {
-            color=blue
-            20 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            22 [label="Exit local class <anonymous>"];
-            23 [label="Function call: R|java/lang/Exception.Exception|()"];
-            24 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-            25 [label="Stub" style="filled" fillcolor=gray];
-            subgraph cluster_17 {
+            65 [label="Enter init block" style="filled" fillcolor=red];
+            subgraph cluster_16 {
                 color=blue
-                26 [label="Enter function foo" style="filled" fillcolor=red];
-                28 [label="Const: Int(1)"];
-                29 [label="Const: Int(1)"];
-                30 [label="Function call: Int(1).R|kotlin/Int.plus|(...)"];
-                31 [label="Variable declaration: lval c: R|kotlin/Int|"];
-                32 [label="Function call: R|java/lang/Exception.Exception|()"];
-                33 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-                34 [label="Stub" style="filled" fillcolor=gray];
-                27 [label="Exit function foo" style="filled" fillcolor=red];
+                66 [label="Enter block"];
+                67 [label="Function call: R|java/lang/Exception.Exception|()"];
+                68 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                69 [label="Stub" style="filled" fillcolor=gray];
+                70 [label="Exit block" style="filled" fillcolor=gray];
             }
-            21 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            71 [label="Exit init block" style="filled" fillcolor=red];
         }
-        66 [label="Postponed exit from lambda"];
-        67 [label="Function call: R|/run|(...)"];
-        64 [label="Exit property" style="filled" fillcolor=red];
+        64 [label="Exit class GetterLocalClass" style="filled" fillcolor=red];
     }
-    63 -> {65};
-    65 -> {20};
-    65 -> {66} [color=red];
+    58 -> {59};
+    59 -> {60};
+    59 -> {72 65} [color=red];
+    60 -> {61};
+    61 -> {62};
+    63 -> {65} [color=green];
+    65 -> {66};
     66 -> {67};
-    67 -> {64};
-    20 -> {21 22};
-    20 -> {26 35 38} [color=red];
-    21 -> {20};
-    21 -> {66} [color=green];
-    22 -> {23};
-    23 -> {24};
-    24 -> {64};
-    24 -> {25} [style=dotted];
-    25 -> {21} [style=dotted];
-    26 -> {28};
-    28 -> {29};
-    29 -> {30};
-    30 -> {31};
-    31 -> {32};
-    32 -> {33};
-    33 -> {27};
-    33 -> {34} [style=dotted];
-    34 -> {27} [style=dotted];
-    48 -> {50};
-    48 -> {51 54} [color=red];
-    50 -> {49};
+    67 -> {68};
+    68 -> {71};
+    68 -> {69} [style=dotted];
+    69 -> {70} [style=dotted];
+    70 -> {71} [style=dotted];
+    71 -> {64} [color=green];
+
+    subgraph cluster_17 {
+        color=red
+        72 [label="Enter function <init>" style="filled" fillcolor=red];
+        73 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        74 [label="Exit function <init>" style="filled" fillcolor=red];
+    }
+    72 -> {73};
+    73 -> {74};
 
     subgraph cluster_18 {
         color=red
-        70 [label="Enter property" style="filled" fillcolor=red];
+        75 [label="Enter property" style="filled" fillcolor=red];
         subgraph cluster_19 {
             color=blue
-            68 [label="Enter function getter" style="filled" fillcolor=red];
-            69 [label="Exit function getter" style="filled" fillcolor=red];
-        }
-        subgraph cluster_20 {
-            color=blue
-            72 [label="Try expression enter"];
-            subgraph cluster_21 {
+            34 [label="Enter class InitializerLocalClass" style="filled" fillcolor=red];
+            76 [label="Postponed enter to lambda"];
+            subgraph cluster_20 {
                 color=blue
-                74 [label="Try main block enter"];
+                26 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_21 {
+                    color=blue
+                    27 [label="Enter block"];
+                    28 [label="Exit local class <anonymous>"];
+                    29 [label="Function call: R|java/lang/Exception.Exception|()"];
+                    30 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                    31 [label="Stub" style="filled" fillcolor=gray];
+                    32 [label="Exit block" style="filled" fillcolor=gray];
+                }
                 subgraph cluster_22 {
                     color=blue
-                    77 [label="Enter block"];
-                    78 [label="Const: Int(1)"];
-                    79 [label="Exit block"];
+                    36 [label="Enter init block" style="filled" fillcolor=red];
+                    subgraph cluster_23 {
+                        color=blue
+                        37 [label="Enter block"];
+                        38 [label="Function call: R|java/lang/Exception.Exception|()"];
+                        39 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+                        40 [label="Stub" style="filled" fillcolor=gray];
+                        41 [label="Const: Int(1)" style="filled" fillcolor=gray];
+                        42 [label="Exit block" style="filled" fillcolor=gray];
+                    }
+                    43 [label="Exit init block" style="filled" fillcolor=red];
                 }
-                80 [label="Try main block exit"];
+                35 [label="Exit class InitializerLocalClass" style="filled" fillcolor=red];
             }
-            subgraph cluster_23 {
-                color=blue
-                76 [label="Enter finally"];
-                subgraph cluster_24 {
-                    color=blue
-                    85 [label="Enter block"];
-                    86 [label="Const: Int(0)"];
-                    87 [label="Exit block"];
-                }
-                88 [label="Exit finally"];
-            }
-            subgraph cluster_25 {
-                color=blue
-                75 [label="Catch enter"];
-                subgraph cluster_26 {
-                    color=blue
-                    81 [label="Enter block"];
-                    82 [label="Const: Int(2)"];
-                    83 [label="Exit block"];
-                }
-                84 [label="Catch exit"];
-            }
-            73 [label="Try expression exit"];
+            33 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
         }
-        71 [label="Exit property" style="filled" fillcolor=red];
+        77 [label="Postponed exit from lambda"];
+        78 [label="Function call: R|/run|(...)"];
+        79 [label="Exit property" style="filled" fillcolor=red];
     }
-    70 -> {72};
-    72 -> {74};
-    73 -> {71};
-    74 -> {71 75 76 77};
-    75 -> {71 81};
-    76 -> {85};
+    75 -> {76};
+    76 -> {26};
+    76 -> {77} [color=red];
     77 -> {78};
     78 -> {79};
-    79 -> {80};
-    80 -> {73};
-    81 -> {82};
+    26 -> {33 27};
+    27 -> {28};
+    27 -> {44 55 36} [color=red];
+    28 -> {29};
+    29 -> {30};
+    30 -> {33};
+    30 -> {31} [style=dotted];
+    31 -> {32} [style=dotted];
+    32 -> {33} [style=dotted];
+    33 -> {77} [color=green];
+    33 -> {26} [color=green style=dashed];
+    34 -> {36} [color=green];
+    36 -> {37};
+    37 -> {38};
+    38 -> {39};
+    39 -> {43};
+    39 -> {40} [style=dotted];
+    40 -> {41} [style=dotted];
+    41 -> {42} [style=dotted];
+    42 -> {43} [style=dotted];
+    43 -> {35} [color=green];
+
+    subgraph cluster_24 {
+        color=red
+        80 [label="Enter function getter" style="filled" fillcolor=red];
+        81 [label="Exit function getter" style="filled" fillcolor=red];
+    }
+    80 -> {81};
+
+    subgraph cluster_25 {
+        color=red
+        82 [label="Enter property" style="filled" fillcolor=red];
+        subgraph cluster_26 {
+            color=blue
+            83 [label="Try expression enter"];
+            subgraph cluster_27 {
+                color=blue
+                84 [label="Try main block enter"];
+                subgraph cluster_28 {
+                    color=blue
+                    85 [label="Enter block"];
+                    86 [label="Const: Int(1)"];
+                    87 [label="Exit block"];
+                }
+                88 [label="Try main block exit"];
+            }
+            subgraph cluster_29 {
+                color=blue
+                89 [label="Enter finally"];
+                subgraph cluster_30 {
+                    color=blue
+                    90 [label="Enter block"];
+                    91 [label="Const: Int(0)"];
+                    92 [label="Exit block"];
+                }
+                93 [label="Exit finally"];
+            }
+            subgraph cluster_31 {
+                color=blue
+                94 [label="Catch enter"];
+                subgraph cluster_32 {
+                    color=blue
+                    95 [label="Enter block"];
+                    96 [label="Const: Int(2)"];
+                    97 [label="Exit block"];
+                }
+                98 [label="Catch exit"];
+            }
+            99 [label="Try expression exit"];
+        }
+        100 [label="Exit property" style="filled" fillcolor=red];
+    }
     82 -> {83};
     83 -> {84};
-    84 -> {73};
+    84 -> {100 94 89 85};
     85 -> {86};
     86 -> {87};
     87 -> {88};
-    88 -> {73};
-    68 -> {69};
+    88 -> {99};
+    89 -> {90};
+    90 -> {91};
+    91 -> {92};
+    92 -> {93};
+    93 -> {99};
+    94 -> {100 95};
+    95 -> {96};
+    96 -> {97};
+    97 -> {98};
+    98 -> {99};
+    99 -> {100};
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.kt

@@ -17,7 +17,7 @@ val x3 = run {
         throw Exception()
     }
 
-    class LocalClass {
+    class InitializerLocalClass {
         init {
             throw Exception()
             1
@@ -27,7 +27,7 @@ val x3 = run {
     throw Exception()
 }
     get() {
-        class LocalClass {
+        class GetterLocalClass {
             init {
                 throw Exception()
             }

compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.txt

@@ -17,8 +17,8 @@ FILE: propertiesAndInitBlocks.kt
             throw R|java/lang/Exception.Exception|()
         }
 
-        local final class LocalClass : R|kotlin/Any| {
-            public[local] constructor(): R|LocalClass| {
+        local final class InitializerLocalClass : R|kotlin/Any| {
+            public[local] constructor(): R|InitializerLocalClass| {
                 super<R|kotlin/Any|>()
             }
 
@@ -33,8 +33,8 @@ FILE: propertiesAndInitBlocks.kt
     }
     )
         public get(): R|kotlin/Unit| {
-            local final class LocalClass : R|kotlin/Any| {
-                public[local] constructor(): R|LocalClass| {
+            local final class GetterLocalClass : R|kotlin/Any| {
+                public[local] constructor(): R|GetterLocalClass| {
                     super<R|kotlin/Any|>()
                 }
 

compiler/fir/analysis-tests/testData/resolve/cfg/returnValuesFromLambda.dot

@@ -12,164 +12,205 @@ digraph returnValuesFromLambda_kt {
 
     subgraph cluster_1 {
         color=red
-        2 [label="Enter function <init>" style="filled" fillcolor=red];
-        4 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        3 [label="Exit function <init>" style="filled" fillcolor=red];
+        2 [label="Enter class B" style="filled" fillcolor=red];
+        3 [label="Exit class B" style="filled" fillcolor=red];
     }
-    2 -> {4};
-    4 -> {3};
+    2 -> {3} [color=green];
 
     subgraph cluster_2 {
         color=red
-        5 [label="Enter class B" style="filled" fillcolor=red];
-        6 [label="Exit class B" style="filled" fillcolor=red];
+        4 [label="Enter function <init>" style="filled" fillcolor=red];
+        5 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        6 [label="Exit function <init>" style="filled" fillcolor=red];
     }
-    5 -> {6} [color=green];
+    4 -> {5};
+    5 -> {6};
 
     subgraph cluster_3 {
         color=red
-        7 [label="Enter function <init>" style="filled" fillcolor=red];
-        9 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        8 [label="Exit function <init>" style="filled" fillcolor=red];
+        7 [label="Enter class C" style="filled" fillcolor=red];
+        8 [label="Exit class C" style="filled" fillcolor=red];
     }
-    7 -> {9};
-    9 -> {8};
+    7 -> {8} [color=green];
 
     subgraph cluster_4 {
         color=red
-        10 [label="Enter class C" style="filled" fillcolor=red];
-        11 [label="Exit class C" style="filled" fillcolor=red];
+        9 [label="Enter function <init>" style="filled" fillcolor=red];
+        10 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        11 [label="Exit function <init>" style="filled" fillcolor=red];
     }
-    10 -> {11} [color=green];
+    9 -> {10};
+    10 -> {11};
 
     subgraph cluster_5 {
         color=red
         12 [label="Enter function test_1" style="filled" fillcolor=red];
-        14 [label="Postponed enter to lambda"];
         subgraph cluster_6 {
             color=blue
-            19 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+            13 [label="Enter block"];
+            14 [label="Postponed enter to lambda"];
             subgraph cluster_7 {
                 color=blue
-                21 [label="Enter when"];
+                21 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
                 subgraph cluster_8 {
                     color=blue
-                    23 [label="Enter when branch condition "];
-                    24 [label="Access variable R|<local>/b|"];
-                    25 [label="Exit when branch condition"];
+                    22 [label="Enter block"];
+                    subgraph cluster_9 {
+                        color=blue
+                        23 [label="Enter when"];
+                        subgraph cluster_10 {
+                            color=blue
+                            24 [label="Enter when branch condition "];
+                            25 [label="Access variable R|<local>/b|"];
+                            26 [label="Exit when branch condition"];
+                        }
+                        27 [label="Synthetic else branch"];
+                        28 [label="Enter when branch result"];
+                        subgraph cluster_11 {
+                            color=blue
+                            29 [label="Enter block"];
+                            30 [label="Function call: R|/B.B|()"];
+                            31 [label="Jump: ^@run R|/B.B|()"];
+                            32 [label="Stub" style="filled" fillcolor=gray];
+                            33 [label="Exit block" style="filled" fillcolor=gray];
+                        }
+                        34 [label="Exit when branch result" style="filled" fillcolor=gray];
+                        35 [label="Exit when"];
+                    }
+                    36 [label="Function call: R|/C.C|()"];
+                    37 [label="Exit block"];
                 }
-                33 [label="Synthetic else branch"];
-                26 [label="Enter when branch result"];
-                subgraph cluster_9 {
-                    color=blue
-                    27 [label="Enter block"];
-                    28 [label="Function call: R|/B.B|()"];
-                    29 [label="Jump: ^@run R|/B.B|()"];
-                    30 [label="Stub" style="filled" fillcolor=gray];
-                    31 [label="Exit block" style="filled" fillcolor=gray];
-                }
-                32 [label="Exit when branch result" style="filled" fillcolor=gray];
-                22 [label="Exit when"];
+                38 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
             }
-            34 [label="Function call: R|/C.C|()"];
-            20 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            15 [label="Call arguments union" style="filled" fillcolor=yellow];
+            16 [label="Postponed exit from lambda"];
+            17 [label="Function call: R|kotlin/run|<R|A|>(...)"];
+            18 [label="Variable declaration: lval x: R|A|"];
+            19 [label="Exit block"];
         }
-        17 [label="Call arguments union" style="filled" fillcolor=yellow];
-        15 [label="Postponed exit from lambda"];
-        16 [label="Function call: R|kotlin/run|<R|A|>(...)"];
-        18 [label="Variable declaration: lval x: R|A|"];
-        13 [label="Exit function test_1" style="filled" fillcolor=red];
+        20 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    12 -> {14};
-    14 -> {19};
-    14 -> {15} [color=red];
-    15 -> {16} [color=green];
-    16 -> {18};
-    17 -> {16} [color=red];
-    18 -> {13};
-    19 -> {21};
-    20 -> {15} [color=green];
-    20 -> {17} [color=red];
-    21 -> {23};
-    22 -> {34};
+    12 -> {13};
+    13 -> {14};
+    14 -> {21};
+    14 -> {16} [color=red];
+    15 -> {17} [color=red];
+    16 -> {17} [color=green];
+    17 -> {18};
+    18 -> {19};
+    19 -> {20};
+    21 -> {22};
+    22 -> {23};
     23 -> {24};
     24 -> {25};
-    25 -> {26 33};
-    26 -> {27};
-    27 -> {28};
+    25 -> {26};
+    26 -> {28 27};
+    27 -> {35};
     28 -> {29};
-    29 -> {20};
-    29 -> {30} [style=dotted];
-    30 -> {31} [style=dotted];
+    29 -> {30};
+    30 -> {31};
+    31 -> {38};
     31 -> {32} [style=dotted];
-    32 -> {22} [style=dotted];
-    33 -> {22};
-    34 -> {20};
-
-    subgraph cluster_10 {
-        color=red
-        35 [label="Enter function test_2" style="filled" fillcolor=red];
-        37 [label="Postponed enter to lambda"];
-        subgraph cluster_11 {
-            color=blue
-            42 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            44 [label="Function call: R|/C.C|()"];
-            45 [label="Jump: ^@run R|/C.C|()"];
-            46 [label="Stub" style="filled" fillcolor=gray];
-            43 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
-        }
-        40 [label="Call arguments union" style="filled" fillcolor=yellow];
-        38 [label="Postponed exit from lambda"];
-        39 [label="Function call: R|kotlin/run|<R|C|>(...)"];
-        41 [label="Variable declaration: lval x: R|C|"];
-        36 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
-    35 -> {37};
-    37 -> {42};
-    37 -> {38} [color=red];
-    38 -> {39} [color=green];
-    39 -> {41};
-    40 -> {39} [color=red];
-    41 -> {36};
-    42 -> {44};
-    43 -> {38} [color=green];
-    43 -> {40} [color=red];
-    44 -> {45};
-    45 -> {43};
-    45 -> {46} [style=dotted];
-    46 -> {43} [style=dotted];
+    32 -> {33} [style=dotted];
+    33 -> {34} [style=dotted];
+    34 -> {35} [style=dotted];
+    35 -> {36};
+    36 -> {37};
+    37 -> {38};
+    38 -> {15} [color=red];
+    38 -> {16} [color=green];
 
     subgraph cluster_12 {
         color=red
-        47 [label="Enter function test_3" style="filled" fillcolor=red];
-        49 [label="Postponed enter to lambda"];
+        39 [label="Enter function test_2" style="filled" fillcolor=red];
         subgraph cluster_13 {
             color=blue
-            55 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
-            57 [label="Jump: ^test_3 Unit"];
-            58 [label="Stub" style="filled" fillcolor=gray];
-            56 [label="Exit function anonymousFunction" style="filled" fillcolor=red style="filled" fillcolor=gray];
+            40 [label="Enter block"];
+            41 [label="Postponed enter to lambda"];
+            subgraph cluster_14 {
+                color=blue
+                48 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_15 {
+                    color=blue
+                    49 [label="Enter block"];
+                    50 [label="Function call: R|/C.C|()"];
+                    51 [label="Jump: ^@run R|/C.C|()"];
+                    52 [label="Stub" style="filled" fillcolor=gray];
+                    53 [label="Exit block" style="filled" fillcolor=gray];
+                }
+                54 [label="Exit function anonymousFunction" style="filled" fillcolor=red];
+            }
+            42 [label="Call arguments union" style="filled" fillcolor=yellow];
+            43 [label="Postponed exit from lambda"];
+            44 [label="Function call: R|kotlin/run|<R|C|>(...)"];
+            45 [label="Variable declaration: lval x: R|C|"];
+            46 [label="Exit block"];
         }
-        52 [label="Call arguments union" style="filled" fillcolor=gray];
-        50 [label="Postponed exit from lambda"];
-        51 [label="Function call: R|kotlin/run|<R|kotlin/Nothing|>(...)" style="filled" fillcolor=gray];
-        53 [label="Stub" style="filled" fillcolor=gray];
-        54 [label="Variable declaration: lval x: R|kotlin/Nothing|" style="filled" fillcolor=gray];
-        48 [label="Exit function test_3" style="filled" fillcolor=red];
+        47 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    47 -> {49};
-    49 -> {55};
-    49 -> {50} [color=red];
-    50 -> {51} [color=green];
-    51 -> {48 53} [style=dotted];
-    52 -> {51} [style=dotted];
+    39 -> {40};
+    40 -> {41};
+    41 -> {48};
+    41 -> {43} [color=red];
+    42 -> {44} [color=red];
+    43 -> {44} [color=green];
+    44 -> {45};
+    45 -> {46};
+    46 -> {47};
+    48 -> {49};
+    49 -> {50};
+    50 -> {51};
+    51 -> {54};
+    51 -> {52} [style=dotted];
+    52 -> {53} [style=dotted];
     53 -> {54} [style=dotted];
-    54 -> {48} [style=dotted];
-    55 -> {57};
-    56 -> {52} [style=dotted];
-    56 -> {50} [color=green];
-    57 -> {48};
-    57 -> {58} [style=dotted];
-    58 -> {56} [style=dotted];
+    54 -> {42} [color=red];
+    54 -> {43} [color=green];
+
+    subgraph cluster_16 {
+        color=red
+        55 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_17 {
+            color=blue
+            56 [label="Enter block"];
+            57 [label="Postponed enter to lambda"];
+            subgraph cluster_18 {
+                color=blue
+                65 [label="Enter function anonymousFunction" style="filled" fillcolor=red];
+                subgraph cluster_19 {
+                    color=blue
+                    66 [label="Enter block"];
+                    67 [label="Jump: ^test_3 Unit"];
+                    68 [label="Stub" style="filled" fillcolor=gray];
+                    69 [label="Exit block" style="filled" fillcolor=gray];
+                }
+                70 [label="Exit function anonymousFunction" style="filled" fillcolor=red style="filled" fillcolor=gray];
+            }
+            58 [label="Call arguments union" style="filled" fillcolor=gray];
+            59 [label="Postponed exit from lambda" style="filled" fillcolor=gray];
+            60 [label="Function call: R|kotlin/run|<R|kotlin/Nothing|>(...)" style="filled" fillcolor=gray];
+            61 [label="Stub" style="filled" fillcolor=gray];
+            62 [label="Variable declaration: lval x: R|kotlin/Nothing|" style="filled" fillcolor=gray];
+            63 [label="Exit block" style="filled" fillcolor=gray];
+        }
+        64 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
+    55 -> {56};
+    56 -> {57};
+    57 -> {65};
+    57 -> {59} [color=red];
+    58 -> {60} [style=dotted];
+    59 -> {60} [style=dotted];
+    60 -> {64 61} [style=dotted];
+    61 -> {62} [style=dotted];
+    62 -> {63} [style=dotted];
+    63 -> {64} [style=dotted];
+    65 -> {66};
+    66 -> {67};
+    67 -> {64};
+    67 -> {68} [style=dotted];
+    68 -> {69} [style=dotted];
+    69 -> {70} [style=dotted];
+    70 -> {59 58} [style=dotted];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/safeCalls.dot

@@ -5,98 +5,100 @@ digraph safeCalls_kt {
 
     subgraph cluster_0 {
         color=red
-        0 [label="Enter function foo" style="filled" fillcolor=red];
-        1 [label="Exit function foo" style="filled" fillcolor=red];
+        0 [label="Enter class A" style="filled" fillcolor=red];
+        1 [label="Exit class A" style="filled" fillcolor=red];
     }
-    0 -> {1};
+    0 -> {1} [color=green];
 
     subgraph cluster_1 {
         color=red
-        2 [label="Enter function bar" style="filled" fillcolor=red];
-        3 [label="Exit function bar" style="filled" fillcolor=red];
+        2 [label="Enter function foo" style="filled" fillcolor=red];
+        3 [label="Exit function foo" style="filled" fillcolor=red];
     }
     2 -> {3};
 
     subgraph cluster_2 {
         color=red
-        4 [label="Enter class A" style="filled" fillcolor=red];
-        5 [label="Exit class A" style="filled" fillcolor=red];
+        4 [label="Enter function bar" style="filled" fillcolor=red];
+        5 [label="Exit function bar" style="filled" fillcolor=red];
     }
-    4 -> {5} [color=green];
+    4 -> {5};
 
     subgraph cluster_3 {
         color=red
-        14 [label="Enter class B" style="filled" fillcolor=red];
-        subgraph cluster_4 {
-            color=blue
-            10 [label="Enter function getter" style="filled" fillcolor=red];
-            11 [label="Exit function getter" style="filled" fillcolor=red];
-        }
-        subgraph cluster_5 {
-            color=blue
-            6 [label="Enter function getter" style="filled" fillcolor=red];
-            7 [label="Exit function getter" style="filled" fillcolor=red];
-        }
-        subgraph cluster_6 {
-            color=blue
-            8 [label="Enter property" style="filled" fillcolor=red];
-            9 [label="Exit property" style="filled" fillcolor=red];
-        }
+        6 [label="Enter class B" style="filled" fillcolor=red];
+        7 [label="Exit class B" style="filled" fillcolor=red];
+    }
+    6 -> {7} [color=green];
+
+    subgraph cluster_4 {
+        color=red
+        8 [label="Enter function getter" style="filled" fillcolor=red];
+        9 [label="Exit function getter" style="filled" fillcolor=red];
+    }
+    8 -> {9};
+
+    subgraph cluster_5 {
+        color=red
+        10 [label="Enter function getter" style="filled" fillcolor=red];
+        11 [label="Exit function getter" style="filled" fillcolor=red];
+    }
+    10 -> {11};
+
+    subgraph cluster_6 {
+        color=red
+        12 [label="Enter function test_1" style="filled" fillcolor=red];
         subgraph cluster_7 {
             color=blue
-            12 [label="Enter property" style="filled" fillcolor=red];
-            13 [label="Exit property" style="filled" fillcolor=red];
+            13 [label="Enter block"];
+            14 [label="Access variable R|<local>/x|"];
+            15 [label="Enter safe call"];
+            16 [label="Function call: $subj$.R|/A.foo|()"];
+            17 [label="Exit safe call"];
+            18 [label="Enter safe call"];
+            19 [label="Function call: $subj$.R|/A.bar|()"];
+            20 [label="Exit safe call"];
+            21 [label="Exit block"];
         }
-        15 [label="Exit class B" style="filled" fillcolor=red];
+        22 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    14 -> {8} [color=green];
-    8 -> {9};
-    9 -> {12} [color=green];
-    6 -> {7};
     12 -> {13};
-    13 -> {15} [color=green];
-    10 -> {11};
+    13 -> {14};
+    14 -> {15 17};
+    15 -> {16};
+    16 -> {17};
+    17 -> {18 20};
+    18 -> {19};
+    19 -> {20};
+    20 -> {21};
+    21 -> {22};
 
     subgraph cluster_8 {
         color=red
-        16 [label="Enter function test_1" style="filled" fillcolor=red];
-        18 [label="Access variable R|<local>/x|"];
-        19 [label="Enter safe call"];
-        21 [label="Function call: $subj$.R|/A.foo|()"];
-        20 [label="Exit safe call"];
-        22 [label="Enter safe call"];
-        24 [label="Function call: $subj$.R|/A.bar|()"];
-        23 [label="Exit safe call"];
-        17 [label="Exit function test_1" style="filled" fillcolor=red];
+        23 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_9 {
+            color=blue
+            24 [label="Enter block"];
+            25 [label="Access variable R|<local>/x|"];
+            26 [label="Enter safe call"];
+            27 [label="Access variable R|/B.foo|"];
+            28 [label="Exit safe call"];
+            29 [label="Enter safe call"];
+            30 [label="Access variable R|/B.bar|"];
+            31 [label="Exit safe call"];
+            32 [label="Exit block"];
+        }
+        33 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    16 -> {18};
-    18 -> {19 20};
-    19 -> {21};
-    20 -> {22 23};
-    21 -> {20};
-    22 -> {24};
-    23 -> {17};
-    24 -> {23};
-
-    subgraph cluster_9 {
-        color=red
-        25 [label="Enter function test_2" style="filled" fillcolor=red];
-        27 [label="Access variable R|<local>/x|"];
-        28 [label="Enter safe call"];
-        30 [label="Access variable R|/B.foo|"];
-        29 [label="Exit safe call"];
-        31 [label="Enter safe call"];
-        33 [label="Access variable R|/B.bar|"];
-        32 [label="Exit safe call"];
-        26 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
-    25 -> {27};
-    27 -> {28 29};
-    28 -> {30};
-    29 -> {31 32};
-    30 -> {29};
-    31 -> {33};
-    32 -> {26};
-    33 -> {32};
+    23 -> {24};
+    24 -> {25};
+    25 -> {26 28};
+    26 -> {27};
+    27 -> {28};
+    28 -> {29 31};
+    29 -> {30};
+    30 -> {31};
+    31 -> {32};
+    32 -> {33};
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/simple.dot

@@ -6,29 +6,43 @@ digraph simple_kt {
     subgraph cluster_0 {
         color=red
         0 [label="Enter function foo" style="filled" fillcolor=red];
-        1 [label="Exit function foo" style="filled" fillcolor=red];
+        subgraph cluster_1 {
+            color=blue
+            1 [label="Enter block"];
+            2 [label="Exit block"];
+        }
+        3 [label="Exit function foo" style="filled" fillcolor=red];
     }
     0 -> {1};
+    1 -> {2};
+    2 -> {3};
 
-    subgraph cluster_1 {
+    subgraph cluster_2 {
         color=red
-        2 [label="Enter function test" style="filled" fillcolor=red];
-        4 [label="Const: Int(1)"];
-        5 [label="Variable declaration: lval x: R|kotlin/Int|"];
-        6 [label="Access variable R|<local>/x|"];
-        7 [label="Const: Int(1)"];
-        8 [label="Function call: R|<local>/x|.R|kotlin/Int.plus|(...)"];
-        9 [label="Variable declaration: lval y: R|kotlin/Int|"];
-        10 [label="Function call: R|/foo|()"];
-        3 [label="Exit function test" style="filled" fillcolor=red];
+        4 [label="Enter function test" style="filled" fillcolor=red];
+        subgraph cluster_3 {
+            color=blue
+            5 [label="Enter block"];
+            6 [label="Const: Int(1)"];
+            7 [label="Variable declaration: lval x: R|kotlin/Int|"];
+            8 [label="Access variable R|<local>/x|"];
+            9 [label="Const: Int(1)"];
+            10 [label="Function call: R|<local>/x|.R|kotlin/Int.plus|(...)"];
+            11 [label="Variable declaration: lval y: R|kotlin/Int|"];
+            12 [label="Function call: R|/foo|()"];
+            13 [label="Exit block"];
+        }
+        14 [label="Exit function test" style="filled" fillcolor=red];
     }
-    2 -> {4};
     4 -> {5};
     5 -> {6};
     6 -> {7};
     7 -> {8};
     8 -> {9};
     9 -> {10};
-    10 -> {3};
+    10 -> {11};
+    11 -> {12};
+    12 -> {13};
+    13 -> {14};
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/tryCatch.dot

@@ -8,294 +8,315 @@ digraph tryCatch_kt {
         0 [label="Enter function test_1" style="filled" fillcolor=red];
         subgraph cluster_1 {
             color=blue
-            2 [label="Try expression enter"];
+            1 [label="Enter block"];
             subgraph cluster_2 {
                 color=blue
-                4 [label="Try main block enter"];
+                2 [label="Try expression enter"];
                 subgraph cluster_3 {
                     color=blue
-                    7 [label="Enter block"];
-                    8 [label="Const: Int(1)"];
-                    9 [label="Variable declaration: lval x: R|kotlin/Int|"];
-                    10 [label="Exit block"];
+                    3 [label="Try main block enter"];
+                    subgraph cluster_4 {
+                        color=blue
+                        4 [label="Enter block"];
+                        5 [label="Const: Int(1)"];
+                        6 [label="Variable declaration: lval x: R|kotlin/Int|"];
+                        7 [label="Exit block"];
+                    }
+                    8 [label="Try main block exit"];
                 }
-                11 [label="Try main block exit"];
-            }
-            subgraph cluster_4 {
-                color=blue
-                6 [label="Catch enter"];
                 subgraph cluster_5 {
                     color=blue
-                    17 [label="Enter block"];
-                    18 [label="Const: Int(3)"];
-                    19 [label="Variable declaration: lval z: R|kotlin/Int|"];
-                    20 [label="Exit block"];
+                    9 [label="Catch enter"];
+                    subgraph cluster_6 {
+                        color=blue
+                        10 [label="Enter block"];
+                        11 [label="Const: Int(3)"];
+                        12 [label="Variable declaration: lval z: R|kotlin/Int|"];
+                        13 [label="Exit block"];
+                    }
+                    14 [label="Catch exit"];
                 }
-                21 [label="Catch exit"];
-            }
-            subgraph cluster_6 {
-                color=blue
-                5 [label="Catch enter"];
                 subgraph cluster_7 {
                     color=blue
-                    12 [label="Enter block"];
-                    13 [label="Const: Int(2)"];
-                    14 [label="Variable declaration: lval y: R|kotlin/Int|"];
-                    15 [label="Exit block"];
+                    15 [label="Catch enter"];
+                    subgraph cluster_8 {
+                        color=blue
+                        16 [label="Enter block"];
+                        17 [label="Const: Int(2)"];
+                        18 [label="Variable declaration: lval y: R|kotlin/Int|"];
+                        19 [label="Exit block"];
+                    }
+                    20 [label="Catch exit"];
                 }
-                16 [label="Catch exit"];
+                21 [label="Try expression exit"];
             }
-            3 [label="Try expression exit"];
+            22 [label="Exit block"];
         }
-        1 [label="Exit function test_1" style="filled" fillcolor=red];
+        23 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    0 -> {2};
-    2 -> {4};
-    3 -> {1};
-    4 -> {1 5 6 7};
-    5 -> {1 12};
-    6 -> {1 17};
+    0 -> {1};
+    1 -> {2};
+    2 -> {3};
+    3 -> {23 15 9 4};
+    4 -> {5};
+    5 -> {6};
+    6 -> {7};
     7 -> {8};
-    8 -> {9};
-    9 -> {10};
+    8 -> {21};
+    9 -> {23 10};
     10 -> {11};
-    11 -> {3};
+    11 -> {12};
     12 -> {13};
     13 -> {14};
-    14 -> {15};
-    15 -> {16};
-    16 -> {3};
+    14 -> {21};
+    15 -> {23 16};
+    16 -> {17};
     17 -> {18};
     18 -> {19};
     19 -> {20};
     20 -> {21};
-    21 -> {3};
+    21 -> {22};
+    22 -> {23};
 
-    subgraph cluster_8 {
+    subgraph cluster_9 {
         color=red
-        22 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_9 {
+        24 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_10 {
             color=blue
-            24 [label="Try expression enter"];
-            subgraph cluster_10 {
+            25 [label="Enter block"];
+            subgraph cluster_11 {
                 color=blue
-                26 [label="Try main block enter"];
-                subgraph cluster_11 {
+                26 [label="Try expression enter"];
+                subgraph cluster_12 {
                     color=blue
-                    28 [label="Enter block"];
-                    29 [label="Const: Int(1)"];
-                    30 [label="Exit block"];
+                    27 [label="Try main block enter"];
+                    subgraph cluster_13 {
+                        color=blue
+                        28 [label="Enter block"];
+                        29 [label="Const: Int(1)"];
+                        30 [label="Exit block"];
+                    }
+                    31 [label="Try main block exit"];
                 }
-                31 [label="Try main block exit"];
-            }
-            subgraph cluster_12 {
-                color=blue
-                27 [label="Catch enter"];
-                subgraph cluster_13 {
+                subgraph cluster_14 {
                     color=blue
-                    32 [label="Enter block"];
-                    33 [label="Const: Int(2)"];
-                    34 [label="Exit block"];
+                    32 [label="Catch enter"];
+                    subgraph cluster_15 {
+                        color=blue
+                        33 [label="Enter block"];
+                        34 [label="Const: Int(2)"];
+                        35 [label="Exit block"];
+                    }
+                    36 [label="Catch exit"];
                 }
-                35 [label="Catch exit"];
+                37 [label="Try expression exit"];
             }
-            25 [label="Try expression exit"];
+            38 [label="Variable declaration: lval x: R|kotlin/Int|"];
+            39 [label="Exit block"];
         }
-        36 [label="Variable declaration: lval x: R|kotlin/Int|"];
-        23 [label="Exit function test_2" style="filled" fillcolor=red];
+        40 [label="Exit function test_2" style="filled" fillcolor=red];
     }
-    22 -> {24};
-    24 -> {26};
-    25 -> {36};
-    26 -> {23 27 28};
-    27 -> {23 32};
+    24 -> {25};
+    25 -> {26};
+    26 -> {27};
+    27 -> {40 32 28};
     28 -> {29};
     29 -> {30};
     30 -> {31};
-    31 -> {25};
-    32 -> {33};
+    31 -> {37};
+    32 -> {40 33};
     33 -> {34};
     34 -> {35};
-    35 -> {25};
-    36 -> {23};
+    35 -> {36};
+    36 -> {37};
+    37 -> {38};
+    38 -> {39};
+    39 -> {40};
 
-    subgraph cluster_14 {
+    subgraph cluster_16 {
         color=red
-        37 [label="Enter function test_3" style="filled" fillcolor=red];
-        subgraph cluster_15 {
+        41 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_17 {
             color=blue
-            39 [label="Enter while loop"];
-            subgraph cluster_16 {
+            42 [label="Enter block"];
+            subgraph cluster_18 {
                 color=blue
-                41 [label="Enter loop condition"];
-                42 [label="Const: Boolean(true)"];
-                43 [label="Exit loop condition"];
-            }
-            subgraph cluster_17 {
-                color=blue
-                44 [label="Enter loop block"];
-                subgraph cluster_18 {
+                43 [label="Enter while loop"];
+                subgraph cluster_19 {
                     color=blue
-                    45 [label="Enter block"];
-                    subgraph cluster_19 {
+                    44 [label="Enter loop condition"];
+                    45 [label="Const: Boolean(true)"];
+                    46 [label="Exit loop condition"];
+                }
+                subgraph cluster_20 {
+                    color=blue
+                    47 [label="Enter loop block"];
+                    subgraph cluster_21 {
                         color=blue
-                        46 [label="Try expression enter"];
-                        subgraph cluster_20 {
+                        48 [label="Enter block"];
+                        subgraph cluster_22 {
                             color=blue
-                            48 [label="Try main block enter"];
-                            subgraph cluster_21 {
+                            49 [label="Try expression enter"];
+                            subgraph cluster_23 {
                                 color=blue
-                                51 [label="Enter block"];
-                                subgraph cluster_22 {
+                                50 [label="Try main block enter"];
+                                subgraph cluster_24 {
                                     color=blue
-                                    52 [label="Enter when"];
-                                    subgraph cluster_23 {
+                                    51 [label="Enter block"];
+                                    subgraph cluster_25 {
                                         color=blue
-                                        54 [label="Enter when branch condition "];
-                                        55 [label="Access variable R|<local>/b|"];
-                                        56 [label="Exit when branch condition"];
+                                        52 [label="Enter when"];
+                                        subgraph cluster_26 {
+                                            color=blue
+                                            53 [label="Enter when branch condition "];
+                                            54 [label="Access variable R|<local>/b|"];
+                                            55 [label="Exit when branch condition"];
+                                        }
+                                        56 [label="Synthetic else branch"];
+                                        57 [label="Enter when branch result"];
+                                        subgraph cluster_27 {
+                                            color=blue
+                                            58 [label="Enter block"];
+                                            59 [label="Jump: ^test_3 Unit"];
+                                            60 [label="Stub" style="filled" fillcolor=gray];
+                                            61 [label="Exit block" style="filled" fillcolor=gray];
+                                        }
+                                        62 [label="Exit when branch result" style="filled" fillcolor=gray];
+                                        63 [label="Exit when"];
                                     }
-                                    63 [label="Synthetic else branch"];
-                                    57 [label="Enter when branch result"];
-                                    subgraph cluster_24 {
+                                    64 [label="Const: Int(1)"];
+                                    65 [label="Variable declaration: lval x: R|kotlin/Int|"];
+                                    subgraph cluster_28 {
                                         color=blue
-                                        58 [label="Enter block"];
-                                        59 [label="Jump: ^test_3 Unit"];
-                                        60 [label="Stub" style="filled" fillcolor=gray];
-                                        61 [label="Exit block" style="filled" fillcolor=gray];
+                                        66 [label="Enter when"];
+                                        subgraph cluster_29 {
+                                            color=blue
+                                            67 [label="Enter when branch condition "];
+                                            68 [label="Access variable R|<local>/b|"];
+                                            69 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
+                                            70 [label="Exit when branch condition"];
+                                        }
+                                        71 [label="Synthetic else branch"];
+                                        72 [label="Enter when branch result"];
+                                        subgraph cluster_30 {
+                                            color=blue
+                                            73 [label="Enter block"];
+                                            74 [label="Jump: break@@@[Boolean(true)] "];
+                                            75 [label="Stub" style="filled" fillcolor=gray];
+                                            76 [label="Exit block" style="filled" fillcolor=gray];
+                                        }
+                                        77 [label="Exit when branch result" style="filled" fillcolor=gray];
+                                        78 [label="Exit when"];
                                     }
-                                    62 [label="Exit when branch result" style="filled" fillcolor=gray];
-                                    53 [label="Exit when"];
+                                    79 [label="Exit block"];
                                 }
-                                64 [label="Const: Int(1)"];
-                                65 [label="Variable declaration: lval x: R|kotlin/Int|"];
-                                subgraph cluster_25 {
-                                    color=blue
-                                    66 [label="Enter when"];
-                                    subgraph cluster_26 {
-                                        color=blue
-                                        68 [label="Enter when branch condition "];
-                                        69 [label="Access variable R|<local>/b|"];
-                                        70 [label="Function call: R|<local>/b|.R|kotlin/Boolean.not|()"];
-                                        71 [label="Exit when branch condition"];
-                                    }
-                                    78 [label="Synthetic else branch"];
-                                    72 [label="Enter when branch result"];
-                                    subgraph cluster_27 {
-                                        color=blue
-                                        73 [label="Enter block"];
-                                        74 [label="Jump: break@@@[Boolean(true)] "];
-                                        75 [label="Stub" style="filled" fillcolor=gray];
-                                        76 [label="Exit block" style="filled" fillcolor=gray];
-                                    }
-                                    77 [label="Exit when branch result" style="filled" fillcolor=gray];
-                                    67 [label="Exit when"];
-                                }
-                                79 [label="Exit block"];
+                                80 [label="Try main block exit"];
                             }
-                            80 [label="Try main block exit"];
-                        }
-                        subgraph cluster_28 {
-                            color=blue
-                            50 [label="Catch enter"];
-                            subgraph cluster_29 {
-                                color=blue
-                                86 [label="Enter block"];
-                                87 [label="Jump: break@@@[Boolean(true)] "];
-                                88 [label="Stub" style="filled" fillcolor=gray];
-                                89 [label="Exit block" style="filled" fillcolor=gray];
-                            }
-                            90 [label="Catch exit" style="filled" fillcolor=gray];
-                        }
-                        subgraph cluster_30 {
-                            color=blue
-                            49 [label="Catch enter"];
                             subgraph cluster_31 {
                                 color=blue
-                                81 [label="Enter block"];
-                                82 [label="Jump: continue@@@[Boolean(true)] "];
-                                83 [label="Stub" style="filled" fillcolor=gray];
-                                84 [label="Exit block" style="filled" fillcolor=gray];
+                                81 [label="Catch enter"];
+                                subgraph cluster_32 {
+                                    color=blue
+                                    82 [label="Enter block"];
+                                    83 [label="Jump: break@@@[Boolean(true)] "];
+                                    84 [label="Stub" style="filled" fillcolor=gray];
+                                    85 [label="Exit block" style="filled" fillcolor=gray];
+                                }
+                                86 [label="Catch exit" style="filled" fillcolor=gray];
                             }
-                            85 [label="Catch exit" style="filled" fillcolor=gray];
+                            subgraph cluster_33 {
+                                color=blue
+                                91 [label="Catch enter"];
+                                subgraph cluster_34 {
+                                    color=blue
+                                    92 [label="Enter block"];
+                                    93 [label="Jump: continue@@@[Boolean(true)] "];
+                                    94 [label="Stub" style="filled" fillcolor=gray];
+                                    95 [label="Exit block" style="filled" fillcolor=gray];
+                                }
+                                96 [label="Catch exit" style="filled" fillcolor=gray];
+                            }
+                            97 [label="Try expression exit"];
                         }
-                        47 [label="Try expression exit"];
+                        98 [label="Const: Int(2)"];
+                        99 [label="Variable declaration: lval y: R|kotlin/Int|"];
+                        100 [label="Exit block"];
                     }
-                    91 [label="Const: Int(2)"];
-                    92 [label="Variable declaration: lval y: R|kotlin/Int|"];
-                    93 [label="Exit block"];
+                    101 [label="Exit loop block"];
                 }
-                94 [label="Exit loop block"];
+                87 [label="Exit whileloop"];
             }
-            40 [label="Exit whileloop"];
+            88 [label="Const: Int(3)"];
+            89 [label="Variable declaration: lval z: R|kotlin/Int|"];
+            90 [label="Exit block"];
         }
-        95 [label="Const: Int(3)"];
-        96 [label="Variable declaration: lval z: R|kotlin/Int|"];
-        38 [label="Exit function test_3" style="filled" fillcolor=red];
+        102 [label="Exit function test_3" style="filled" fillcolor=red];
     }
-    37 -> {39};
-    39 -> {41};
-    40 -> {95};
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    43 -> {40} [style=dotted];
     44 -> {45};
     45 -> {46};
-    46 -> {48};
-    47 -> {91};
-    48 -> {38 49 50 51};
-    49 -> {38 81};
-    50 -> {38 86};
+    46 -> {47};
+    46 -> {87} [style=dotted];
+    47 -> {48};
+    48 -> {49};
+    49 -> {50};
+    50 -> {102 91 81 51};
     51 -> {52};
-    52 -> {54};
-    53 -> {64};
+    52 -> {53};
+    53 -> {54};
     54 -> {55};
-    55 -> {56};
-    56 -> {57 63};
+    55 -> {57 56};
+    56 -> {63};
     57 -> {58};
     58 -> {59};
-    59 -> {38};
+    59 -> {102};
     59 -> {60} [style=dotted];
     60 -> {61} [style=dotted];
     61 -> {62} [style=dotted];
-    62 -> {53} [style=dotted];
-    63 -> {53};
+    62 -> {63} [style=dotted];
+    63 -> {64};
     64 -> {65};
     65 -> {66};
-    66 -> {68};
-    67 -> {79};
+    66 -> {67};
+    67 -> {68};
     68 -> {69};
     69 -> {70};
-    70 -> {71};
-    71 -> {72 78};
+    70 -> {72 71};
+    71 -> {78};
     72 -> {73};
     73 -> {74};
-    74 -> {40};
+    74 -> {87};
     74 -> {75} [style=dotted];
     75 -> {76} [style=dotted];
     76 -> {77} [style=dotted];
-    77 -> {67} [style=dotted];
-    78 -> {67};
+    77 -> {78} [style=dotted];
+    78 -> {79};
     79 -> {80};
-    80 -> {47};
-    81 -> {82};
-    82 -> {39};
-    82 -> {83} [style=dotted];
+    80 -> {97};
+    81 -> {102 82};
+    82 -> {83};
+    83 -> {87};
     83 -> {84} [style=dotted];
     84 -> {85} [style=dotted];
-    85 -> {47} [style=dotted];
-    86 -> {87};
-    87 -> {40};
-    87 -> {88} [style=dotted];
-    88 -> {89} [style=dotted];
-    89 -> {90} [style=dotted];
-    90 -> {47} [style=dotted];
-    91 -> {92};
+    85 -> {86} [style=dotted];
+    86 -> {97} [style=dotted];
+    87 -> {88};
+    88 -> {89};
+    89 -> {90};
+    90 -> {102};
+    91 -> {102 92};
     92 -> {93};
-    93 -> {94};
-    94 -> {41};
-    95 -> {96};
-    96 -> {38};
+    93 -> {94} [style=dotted];
+    93 -> {43} [color=green style=dashed];
+    94 -> {95} [style=dotted];
+    95 -> {96} [style=dotted];
+    96 -> {97} [style=dotted];
+    97 -> {98};
+    98 -> {99};
+    99 -> {100};
+    100 -> {101};
+    101 -> {44} [color=green style=dashed];
 
 }

compiler/fir/analysis-tests/testData/resolve/cfg/when.dot

@@ -8,195 +8,209 @@ digraph when_kt {
         0 [label="Enter function test_1" style="filled" fillcolor=red];
         subgraph cluster_1 {
             color=blue
-            2 [label="Enter when"];
+            1 [label="Enter block"];
             subgraph cluster_2 {
                 color=blue
-                4 [label="Enter when branch condition "];
-                5 [label="Access variable R|<local>/x|"];
-                6 [label="Const: Int(1)"];
-                7 [label="Operator =="];
-                8 [label="Exit when branch condition"];
+                2 [label="Enter when"];
+                subgraph cluster_3 {
+                    color=blue
+                    3 [label="Enter when branch condition "];
+                    4 [label="Access variable R|<local>/x|"];
+                    5 [label="Const: Int(1)"];
+                    6 [label="Operator =="];
+                    7 [label="Exit when branch condition"];
+                }
+                subgraph cluster_4 {
+                    color=blue
+                    8 [label="Enter when branch condition "];
+                    9 [label="Access variable R|<local>/x|"];
+                    10 [label="Const: Int(2)"];
+                    11 [label="Function call: R|<local>/x|.R|kotlin/Int.rem|(...)"];
+                    12 [label="Const: Int(0)"];
+                    13 [label="Operator =="];
+                    14 [label="Exit when branch condition"];
+                }
+                subgraph cluster_5 {
+                    color=blue
+                    15 [label="Enter when branch condition "];
+                    16 [label="Const: Int(1)"];
+                    17 [label="Const: Int(1)"];
+                    18 [label="Function call: Int(1).R|kotlin/Int.minus|(...)"];
+                    19 [label="Const: Int(0)"];
+                    20 [label="Operator =="];
+                    21 [label="Exit when branch condition"];
+                }
+                subgraph cluster_6 {
+                    color=blue
+                    22 [label="Enter when branch condition else"];
+                    23 [label="Exit when branch condition"];
+                }
+                24 [label="Enter when branch result"];
+                subgraph cluster_7 {
+                    color=blue
+                    25 [label="Enter block"];
+                    26 [label="Const: Int(5)"];
+                    27 [label="Exit block"];
+                }
+                28 [label="Exit when branch result"];
+                29 [label="Enter when branch result"];
+                subgraph cluster_8 {
+                    color=blue
+                    30 [label="Enter block"];
+                    31 [label="Jump: ^test_1 Unit"];
+                    32 [label="Stub" style="filled" fillcolor=gray];
+                    33 [label="Exit block" style="filled" fillcolor=gray];
+                }
+                34 [label="Exit when branch result" style="filled" fillcolor=gray];
+                35 [label="Enter when branch result"];
+                subgraph cluster_9 {
+                    color=blue
+                    36 [label="Enter block"];
+                    37 [label="Const: Int(20)"];
+                    38 [label="Exit block"];
+                }
+                39 [label="Exit when branch result"];
+                40 [label="Enter when branch result"];
+                subgraph cluster_10 {
+                    color=blue
+                    41 [label="Enter block"];
+                    42 [label="Const: Int(10)"];
+                    43 [label="Exit block"];
+                }
+                44 [label="Exit when branch result"];
+                45 [label="Exit when"];
             }
-            subgraph cluster_3 {
-                color=blue
-                14 [label="Enter when branch condition "];
-                15 [label="Access variable R|<local>/x|"];
-                16 [label="Const: Int(2)"];
-                17 [label="Function call: R|<local>/x|.R|kotlin/Int.rem|(...)"];
-                18 [label="Const: Int(0)"];
-                19 [label="Operator =="];
-                20 [label="Exit when branch condition"];
-            }
-            subgraph cluster_4 {
-                color=blue
-                26 [label="Enter when branch condition "];
-                27 [label="Const: Int(1)"];
-                28 [label="Const: Int(1)"];
-                29 [label="Function call: Int(1).R|kotlin/Int.minus|(...)"];
-                30 [label="Const: Int(0)"];
-                31 [label="Operator =="];
-                32 [label="Exit when branch condition"];
-            }
-            subgraph cluster_5 {
-                color=blue
-                39 [label="Enter when branch condition else"];
-                40 [label="Exit when branch condition"];
-            }
-            41 [label="Enter when branch result"];
-            subgraph cluster_6 {
-                color=blue
-                42 [label="Enter block"];
-                43 [label="Const: Int(5)"];
-                44 [label="Exit block"];
-            }
-            45 [label="Exit when branch result"];
-            33 [label="Enter when branch result"];
-            subgraph cluster_7 {
-                color=blue
-                34 [label="Enter block"];
-                35 [label="Jump: ^test_1 Unit"];
-                36 [label="Stub" style="filled" fillcolor=gray];
-                37 [label="Exit block" style="filled" fillcolor=gray];
-            }
-            38 [label="Exit when branch result" style="filled" fillcolor=gray];
-            21 [label="Enter when branch result"];
-            subgraph cluster_8 {
-                color=blue
-                22 [label="Enter block"];
-                23 [label="Const: Int(20)"];
-                24 [label="Exit block"];
-            }
-            25 [label="Exit when branch result"];
-            9 [label="Enter when branch result"];
-            subgraph cluster_9 {
-                color=blue
-                10 [label="Enter block"];
-                11 [label="Const: Int(10)"];
-                12 [label="Exit block"];
-            }
-            13 [label="Exit when branch result"];
-            3 [label="Exit when"];
+            46 [label="Variable declaration: lval y: R|kotlin/Int|"];
+            47 [label="Exit block"];
         }
-        46 [label="Variable declaration: lval y: R|kotlin/Int|"];
-        1 [label="Exit function test_1" style="filled" fillcolor=red];
+        48 [label="Exit function test_1" style="filled" fillcolor=red];
     }
-    0 -> {2};
-    2 -> {4};
-    3 -> {46};
+    0 -> {1};
+    1 -> {2};
+    2 -> {3};
+    3 -> {4};
     4 -> {5};
     5 -> {6};
     6 -> {7};
-    7 -> {8};
-    8 -> {9 14};
+    7 -> {40 8};
+    8 -> {9};
     9 -> {10};
     10 -> {11};
     11 -> {12};
     12 -> {13};
-    13 -> {3};
-    14 -> {15};
+    13 -> {14};
+    14 -> {35 15};
     15 -> {16};
     16 -> {17};
     17 -> {18};
     18 -> {19};
     19 -> {20};
-    20 -> {21 26};
-    21 -> {22};
+    20 -> {21};
+    21 -> {29 22};
     22 -> {23};
     23 -> {24};
     24 -> {25};
-    25 -> {3};
+    25 -> {26};
     26 -> {27};
     27 -> {28};
-    28 -> {29};
+    28 -> {45};
     29 -> {30};
     30 -> {31};
-    31 -> {32};
-    32 -> {33 39};
-    33 -> {34};
-    34 -> {35};
-    35 -> {1};
-    35 -> {36} [style=dotted];
-    36 -> {37} [style=dotted];
-    37 -> {38} [style=dotted];
-    38 -> {3} [style=dotted];
-    39 -> {40};
+    31 -> {48};
+    31 -> {32} [style=dotted];
+    32 -> {33} [style=dotted];
+    33 -> {34} [style=dotted];
+    34 -> {45} [style=dotted];
+    35 -> {36};
+    36 -> {37};
+    37 -> {38};
+    38 -> {39};
+    39 -> {45};
     40 -> {41};
     41 -> {42};
     42 -> {43};
     43 -> {44};
     44 -> {45};
-    45 -> {3};
-    46 -> {1};
-
-    subgraph cluster_10 {
-        color=red
-        47 [label="Enter class A" style="filled" fillcolor=red];
-        48 [label="Exit class A" style="filled" fillcolor=red];
-    }
-    47 -> {48} [color=green];
+    45 -> {46};
+    46 -> {47};
+    47 -> {48};
 
     subgraph cluster_11 {
         color=red
-        49 [label="Enter class B" style="filled" fillcolor=red];
-        50 [label="Exit class B" style="filled" fillcolor=red];
+        49 [label="Enter class A" style="filled" fillcolor=red];
+        50 [label="Exit class A" style="filled" fillcolor=red];
     }
     49 -> {50} [color=green];
 
     subgraph cluster_12 {
         color=red
-        51 [label="Enter function test_2" style="filled" fillcolor=red];
-        subgraph cluster_13 {
-            color=blue
-            53 [label="Enter when"];
-            subgraph cluster_14 {
-                color=blue
-                55 [label="Enter when branch condition "];
-                subgraph cluster_15 {
-                    color=blue
-                    57 [label="Enter &&"];
-                    58 [label="Access variable R|<local>/x|"];
-                    59 [label="Type operator: (R|<local>/x| is R|A|)"];
-                    60 [label="Exit left part of &&"];
-                    61 [label="Enter right part of &&"];
-                    62 [label="Access variable R|<local>/x|"];
-                    63 [label="Type operator: (R|<local>/x| is R|B|)"];
-                    56 [label="Exit &&"];
-                }
-                64 [label="Exit when branch condition"];
-            }
-            71 [label="Synthetic else branch"];
-            65 [label="Enter when branch result"];
-            subgraph cluster_16 {
-                color=blue
-                66 [label="Enter block"];
-                67 [label="Access variable R|<local>/x|"];
-                68 [label="Type operator: (R|<local>/x| is R|A|)"];
-                69 [label="Exit block"];
-            }
-            70 [label="Exit when branch result"];
-            54 [label="Exit when"];
-        }
-        52 [label="Exit function test_2" style="filled" fillcolor=red];
+        51 [label="Enter class B" style="filled" fillcolor=red];
+        52 [label="Exit class B" style="filled" fillcolor=red];
     }
-    51 -> {53};
-    53 -> {55};
-    54 -> {52};
-    55 -> {57};
-    56 -> {64};
+    51 -> {52} [color=green];
+
+    subgraph cluster_13 {
+        color=red
+        53 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_14 {
+            color=blue
+            54 [label="Enter block"];
+            subgraph cluster_15 {
+                color=blue
+                55 [label="Enter when"];
+                subgraph cluster_16 {
+                    color=blue
+                    56 [label="Enter when branch condition "];
+                    subgraph cluster_17 {
+                        color=blue
+                        57 [label="Enter &&"];
+                        58 [label="Access variable R|<local>/x|"];
+                        59 [label="Type operator: (R|<local>/x| is R|A|)"];
+                        60 [label="Exit left part of &&"];
+                        61 [label="Enter right part of &&"];
+                        62 [label="Access variable R|<local>/x|"];
+                        63 [label="Type operator: (R|<local>/x| is R|B|)"];
+                        64 [label="Exit &&"];
+                    }
+                    65 [label="Exit when branch condition"];
+                }
+                66 [label="Synthetic else branch"];
+                67 [label="Enter when branch result"];
+                subgraph cluster_18 {
+                    color=blue
+                    68 [label="Enter block"];
+                    69 [label="Access variable R|<local>/x|"];
+                    70 [label="Type operator: (R|<local>/x| is R|A|)"];
+                    71 [label="Exit block"];
+                }
+                72 [label="Exit when branch result"];
+                73 [label="Exit when"];
+            }
+            74 [label="Exit block"];
+        }
+        75 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
+    53 -> {54};
+    54 -> {55};
+    55 -> {56};
+    56 -> {57};
     57 -> {58};
     58 -> {59};
     59 -> {60};
-    60 -> {56 61};
+    60 -> {64 61};
     61 -> {62};
     62 -> {63};
-    63 -> {56};
-    64 -> {65 71};
-    65 -> {66};
-    66 -> {67};
+    63 -> {64};
+    64 -> {65};
+    65 -> {67 66};
+    66 -> {73};
     67 -> {68};
     68 -> {69};
     69 -> {70};
-    70 -> {54};
-    71 -> {54};
+    70 -> {71};
+    71 -> {72};
+    72 -> {73};
+    73 -> {74};
+    74 -> {75};
 
 }

compiler/fir/analysis-tests/testData/resolve/exhaustiveWhenAndDNNType.dot

@@ -5,125 +5,146 @@ digraph exhaustiveWhenAndDNNType_kt {
 
     subgraph cluster_0 {
         color=red
-        0 [label="Enter function <init>" style="filled" fillcolor=red];
-        2 [label="Delegated constructor call: super<R|kotlin/Enum<SomeEnum>|>()"];
-        1 [label="Exit function <init>" style="filled" fillcolor=red];
+        0 [label="Enter class SomeEnum" style="filled" fillcolor=red];
+        1 [label="Exit class SomeEnum" style="filled" fillcolor=red];
     }
-    0 -> {2};
-    2 -> {1};
+    0 -> {1} [color=green];
 
     subgraph cluster_1 {
         color=red
-        3 [label="Enter function values" style="filled" fillcolor=red];
-        4 [label="Exit function values" style="filled" fillcolor=red];
+        2 [label="Enter function <init>" style="filled" fillcolor=red];
+        3 [label="Delegated constructor call: super<R|kotlin/Enum<SomeEnum>|>()"];
+        4 [label="Exit function <init>" style="filled" fillcolor=red];
     }
+    2 -> {3};
     3 -> {4};
 
     subgraph cluster_2 {
         color=red
-        5 [label="Enter function valueOf" style="filled" fillcolor=red];
-        6 [label="Exit function valueOf" style="filled" fillcolor=red];
+        5 [label="Enter function values" style="filled" fillcolor=red];
+        subgraph cluster_3 {
+            color=blue
+            6 [label="Enter block"];
+            7 [label="Exit block"];
+        }
+        8 [label="Exit function values" style="filled" fillcolor=red];
     }
     5 -> {6};
-
-    subgraph cluster_3 {
-        color=red
-        7 [label="Enter class SomeEnum" style="filled" fillcolor=red];
-        8 [label="Exit class SomeEnum" style="filled" fillcolor=red];
-    }
-    7 -> {8} [color=green];
+    6 -> {7};
+    7 -> {8};
 
     subgraph cluster_4 {
         color=red
-        9 [label="Enter function <init>" style="filled" fillcolor=red];
-        11 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
-        10 [label="Exit function <init>" style="filled" fillcolor=red];
+        9 [label="Enter function valueOf" style="filled" fillcolor=red];
+        subgraph cluster_5 {
+            color=blue
+            10 [label="Enter block"];
+            11 [label="Exit block"];
+        }
+        12 [label="Exit function valueOf" style="filled" fillcolor=red];
     }
-    9 -> {11};
-    11 -> {10};
-
-    subgraph cluster_5 {
-        color=red
-        12 [label="Enter class B" style="filled" fillcolor=red];
-        13 [label="Exit class B" style="filled" fillcolor=red];
-    }
-    12 -> {13} [color=green];
+    9 -> {10};
+    10 -> {11};
+    11 -> {12};
 
     subgraph cluster_6 {
         color=red
-        14 [label="Enter function takeB" style="filled" fillcolor=red];
-        15 [label="Exit function takeB" style="filled" fillcolor=red];
+        13 [label="Enter class B" style="filled" fillcolor=red];
+        14 [label="Exit class B" style="filled" fillcolor=red];
     }
-    14 -> {15};
+    13 -> {14} [color=green];
 
     subgraph cluster_7 {
         color=red
-        16 [label="Enter function test_1" style="filled" fillcolor=red];
-        18 [label="Access qualifier /SomeEnum"];
-        19 [label="Access variable R|/SomeEnum.A1|"];
-        20 [label="Variable declaration: lval flag: R|SomeEnum|"];
-        subgraph cluster_8 {
-            color=blue
-            21 [label="Enter when"];
-            23 [label="Access variable R|<local>/flag|"];
-            24 [label="Check not null: R|<local>/flag|!!"];
-            subgraph cluster_9 {
-                color=blue
-                25 [label="Enter when branch condition "];
-                26 [label="Access qualifier /SomeEnum"];
-                27 [label="Access variable R|/SomeEnum.A1|"];
-                28 [label="Operator =="];
-                29 [label="Exit when branch condition"];
-            }
-            subgraph cluster_10 {
-                color=blue
-                35 [label="Enter when branch condition "];
-                36 [label="Access qualifier /SomeEnum"];
-                37 [label="Access variable R|/SomeEnum.A2|"];
-                38 [label="Operator =="];
-                39 [label="Exit when branch condition"];
-            }
-            40 [label="Enter when branch result"];
-            subgraph cluster_11 {
-                color=blue
-                41 [label="Enter block"];
-                42 [label="Function call: R|/B.B|()"];
-                43 [label="Exit block"];
-            }
-            44 [label="Exit when branch result"];
-            30 [label="Enter when branch result"];
-            subgraph cluster_12 {
-                color=blue
-                31 [label="Enter block"];
-                32 [label="Function call: R|/B.B|()"];
-                33 [label="Exit block"];
-            }
-            34 [label="Exit when branch result"];
-            22 [label="Exit when"];
-        }
-        45 [label="Variable declaration: lval b: R|B|"];
-        46 [label="Access variable R|<local>/b|"];
-        47 [label="Function call: R|/takeB|(...)"];
-        17 [label="Exit function test_1" style="filled" fillcolor=red];
+        15 [label="Enter function <init>" style="filled" fillcolor=red];
+        16 [label="Delegated constructor call: super<R|kotlin/Any|>()"];
+        17 [label="Exit function <init>" style="filled" fillcolor=red];
+    }
+    15 -> {16};
+    16 -> {17};
+
+    subgraph cluster_8 {
+        color=red
+        18 [label="Enter function takeB" style="filled" fillcolor=red];
+        subgraph cluster_9 {
+            color=blue
+            19 [label="Enter block"];
+            20 [label="Exit block"];
+        }
+        21 [label="Exit function takeB" style="filled" fillcolor=red];
     }
-    16 -> {18};
     18 -> {19};
     19 -> {20};
     20 -> {21};
-    21 -> {23};
-    22 -> {45};
+
+    subgraph cluster_10 {
+        color=red
+        22 [label="Enter function test_1" style="filled" fillcolor=red];
+        subgraph cluster_11 {
+            color=blue
+            23 [label="Enter block"];
+            24 [label="Access qualifier /SomeEnum"];
+            25 [label="Access variable R|/SomeEnum.A1|"];
+            26 [label="Variable declaration: lval flag: R|SomeEnum|"];
+            subgraph cluster_12 {
+                color=blue
+                27 [label="Enter when"];
+                28 [label="Access variable R|<local>/flag|"];
+                29 [label="Check not null: R|<local>/flag|!!"];
+                subgraph cluster_13 {
+                    color=blue
+                    30 [label="Enter when branch condition "];
+                    31 [label="Access qualifier /SomeEnum"];
+                    32 [label="Access variable R|/SomeEnum.A1|"];
+                    33 [label="Operator =="];
+                    34 [label="Exit when branch condition"];
+                }
+                subgraph cluster_14 {
+                    color=blue
+                    35 [label="Enter when branch condition "];
+                    36 [label="Access qualifier /SomeEnum"];
+                    37 [label="Access variable R|/SomeEnum.A2|"];
+                    38 [label="Operator =="];
+                    39 [label="Exit when branch condition"];
+                }
+                40 [label="Enter when branch result"];
+                subgraph cluster_15 {
+                    color=blue
+                    41 [label="Enter block"];
+                    42 [label="Function call: R|/B.B|()"];
+                    43 [label="Exit block"];
+                }
+                44 [label="Exit when branch result"];
+                45 [label="Enter when branch result"];
+                subgraph cluster_16 {
+                    color=blue
+                    46 [label="Enter block"];
+                    47 [label="Function call: R|/B.B|()"];
+                    48 [label="Exit block"];
+                }
+                49 [label="Exit when branch result"];
+                50 [label="Exit when"];
+            }
+            51 [label="Variable declaration: lval b: R|B|"];
+            52 [label="Access variable R|<local>/b|"];
+            53 [label="Function call: R|/takeB|(...)"];
+            54 [label="Exit block"];
+        }
+        55 [label="Exit function test_1" style="filled" fillcolor=red];
+    }
+    22 -> {23};
     23 -> {24};
     24 -> {25};
     25 -> {26};
     26 -> {27};
     27 -> {28};
     28 -> {29};
-    29 -> {30 35};
+    29 -> {30};
     30 -> {31};
     31 -> {32};
     32 -> {33};
     33 -> {34};
-    34 -> {22};
+    34 -> {45 35};
     35 -> {36};
     36 -> {37};
     37 -> {38};
@@ -133,81 +154,86 @@ digraph exhaustiveWhenAndDNNType_kt {
     41 -> {42};
     42 -> {43};
     43 -> {44};
-    44 -> {22};
+    44 -> {50};
     45 -> {46};
     46 -> {47};
-    47 -> {17};
-
-    subgraph cluster_13 {
-        color=red
-        48 [label="Enter function test_2" style="filled" fillcolor=red];
-        50 [label="Access qualifier /SomeEnum"];
-        51 [label="Access variable R|/SomeEnum.A1|"];
-        52 [label="Variable declaration: lval flag: R|SomeEnum|"];
-        subgraph cluster_14 {
-            color=blue
-            53 [label="Enter when"];
-            55 [label="Access variable R|<local>/flag|"];
-            56 [label="Check not null: R|<local>/flag|!!"];
-            subgraph cluster_15 {
-                color=blue
-                57 [label="Enter when branch condition "];
-                58 [label="Access qualifier /SomeEnum"];
-                59 [label="Access variable R|/SomeEnum.A1|"];
-                60 [label="Operator =="];
-                61 [label="Exit when branch condition"];
-            }
-            subgraph cluster_16 {
-                color=blue
-                67 [label="Enter when branch condition "];
-                68 [label="Access qualifier /SomeEnum"];
-                69 [label="Access variable R|/SomeEnum.A2|"];
-                70 [label="Operator =="];
-                71 [label="Exit when branch condition"];
-            }
-            72 [label="Enter when branch result"];
-            subgraph cluster_17 {
-                color=blue
-                73 [label="Enter block"];
-                74 [label="Function call: R|/B.B|()"];
-                75 [label="Exit block"];
-            }
-            76 [label="Exit when branch result"];
-            62 [label="Enter when branch result"];
-            subgraph cluster_18 {
-                color=blue
-                63 [label="Enter block"];
-                64 [label="Function call: R|/B.B|()"];
-                65 [label="Exit block"];
-            }
-            66 [label="Exit when branch result"];
-            54 [label="Exit when"];
-        }
-        77 [label="Variable declaration: lval b: R|B|"];
-        78 [label="Access variable R|<local>/b|"];
-        79 [label="Function call: R|/takeB|(...)"];
-        49 [label="Exit function test_2" style="filled" fillcolor=red];
-    }
-    48 -> {50};
+    47 -> {48};
+    48 -> {49};
+    49 -> {50};
     50 -> {51};
     51 -> {52};
     52 -> {53};
-    53 -> {55};
-    54 -> {77};
-    55 -> {56};
+    53 -> {54};
+    54 -> {55};
+
+    subgraph cluster_17 {
+        color=red
+        56 [label="Enter function test_2" style="filled" fillcolor=red];
+        subgraph cluster_18 {
+            color=blue
+            57 [label="Enter block"];
+            58 [label="Access qualifier /SomeEnum"];
+            59 [label="Access variable R|/SomeEnum.A1|"];
+            60 [label="Variable declaration: lval flag: R|SomeEnum|"];
+            subgraph cluster_19 {
+                color=blue
+                61 [label="Enter when"];
+                62 [label="Access variable R|<local>/flag|"];
+                63 [label="Check not null: R|<local>/flag|!!"];
+                subgraph cluster_20 {
+                    color=blue
+                    64 [label="Enter when branch condition "];
+                    65 [label="Access qualifier /SomeEnum"];
+                    66 [label="Access variable R|/SomeEnum.A1|"];
+                    67 [label="Operator =="];
+                    68 [label="Exit when branch condition"];
+                }
+                subgraph cluster_21 {
+                    color=blue
+                    69 [label="Enter when branch condition "];
+                    70 [label="Access qualifier /SomeEnum"];
+                    71 [label="Access variable R|/SomeEnum.A2|"];
+                    72 [label="Operator =="];
+                    73 [label="Exit when branch condition"];
+                }
+                74 [label="Enter when branch result"];
+                subgraph cluster_22 {
+                    color=blue
+                    75 [label="Enter block"];
+                    76 [label="Function call: R|/B.B|()"];
+                    77 [label="Exit block"];
+                }
+                78 [label="Exit when branch result"];
+                79 [label="Enter when branch result"];
+                subgraph cluster_23 {
+                    color=blue
+                    80 [label="Enter block"];
+                    81 [label="Function call: R|/B.B|()"];
+                    82 [label="Exit block"];
+                }
+                83 [label="Exit when branch result"];
+                84 [label="Exit when"];
+            }
+            85 [label="Variable declaration: lval b: R|B|"];
+            86 [label="Access variable R|<local>/b|"];
+            87 [label="Function call: R|/takeB|(...)"];
+            88 [label="Exit block"];
+        }
+        89 [label="Exit function test_2" style="filled" fillcolor=red];
+    }
     56 -> {57};
     57 -> {58};
     58 -> {59};
     59 -> {60};
     60 -> {61};
-    61 -> {62 67};
+    61 -> {62};
     62 -> {63};
     63 -> {64};
     64 -> {65};
     65 -> {66};
-    66 -> {54};
+    66 -> {67};
     67 -> {68};
-    68 -> {69};
+    68 -> {79 69};
     69 -> {70};
     70 -> {71};
     71 -> {72};
@@ -215,89 +241,105 @@ digraph exhaustiveWhenAndDNNType_kt {
     73 -> {74};
     74 -> {75};
     75 -> {76};
-    76 -> {54};
+    76 -> {77};
     77 -> {78};
-    78 -> {79};
-    79 -> {49};
-
-    subgraph cluster_19 {
-        color=red
-        80 [label="Enter function test_3" style="filled" fillcolor=red];
-        82 [label="Access qualifier /SomeEnum"];
-        83 [label="Access variable R|/SomeEnum.A1|"];
-        84 [label="Variable declaration: lval flag: R|SomeEnum|"];
-        subgraph cluster_20 {
-            color=blue
-            85 [label="Enter when"];
-            87 [label="Access variable R|<local>/flag|"];
-            subgraph cluster_21 {
-                color=blue
-                88 [label="Enter when branch condition "];
-                89 [label="Access qualifier /SomeEnum"];
-                90 [label="Access variable R|/SomeEnum.A1|"];
-                91 [label="Operator =="];
-                92 [label="Exit when branch condition"];
-            }
-            subgraph cluster_22 {
-                color=blue
-                98 [label="Enter when branch condition "];
-                99 [label="Access qualifier /SomeEnum"];
-                100 [label="Access variable R|/SomeEnum.A2|"];
-                101 [label="Operator =="];
-                102 [label="Exit when branch condition"];
-            }
-            103 [label="Enter when branch result"];
-            subgraph cluster_23 {
-                color=blue
-                104 [label="Enter block"];
-                105 [label="Function call: R|/B.B|()"];
-                106 [label="Exit block"];
-            }
-            107 [label="Exit when branch result"];
-            93 [label="Enter when branch result"];
-            subgraph cluster_24 {
-                color=blue
-                94 [label="Enter block"];
-                95 [label="Function call: R|/B.B|()"];
-                96 [label="Exit block"];
-            }
-            97 [label="Exit when branch result"];
-            86 [label="Exit when"];
-        }
-        108 [label="Variable declaration: lval b: R|B|"];
-        109 [label="Access variable R|<local>/b|"];
-        110 [label="Function call: R|/takeB|(...)"];
-        81 [label="Exit function test_3" style="filled" fillcolor=red];
-    }
-    80 -> {82};
+    78 -> {84};
+    79 -> {80};
+    80 -> {81};
+    81 -> {82};
     82 -> {83};
     83 -> {84};
     84 -> {85};
-    85 -> {87};
-    86 -> {108};
+    85 -> {86};
+    86 -> {87};
     87 -> {88};
     88 -> {89};
-    89 -> {90};
+
+    subgraph cluster_24 {
+        color=red
+        90 [label="Enter function test_3" style="filled" fillcolor=red];
+        subgraph cluster_25 {
+            color=blue
+            91 [label="Enter block"];
+            92 [label="Access qualifier /SomeEnum"];
+            93 [label="Access variable R|/SomeEnum.A1|"];
+            94 [label="Variable declaration: lval flag: R|SomeEnum|"];
+            subgraph cluster_26 {
+                color=blue
+                95 [label="Enter when"];
+                96 [label="Access variable R|<local>/flag|"];
+                subgraph cluster_27 {
+                    color=blue
+                    97 [label="Enter when branch condition "];
+                    98 [label="Access qualifier /SomeEnum"];
+                    99 [label="Access variable R|/SomeEnum.A1|"];
+                    100 [label="Operator =="];
+                    101 [label="Exit when branch condition"];
+                }
+                subgraph cluster_28 {
+                    color=blue
+                    102 [label="Enter when branch condition "];
+                    103 [label="Access qualifier /SomeEnum"];
+                    104 [label="Access variable R|/SomeEnum.A2|"];
+                    105 [label="Operator =="];
+                    106 [label="Exit when branch condition"];
+                }
+                107 [label="Enter when branch result"];
+                subgraph cluster_29 {
+                    color=blue
+                    108 [label="Enter block"];
+                    109 [label="Function call: R|/B.B|()"];
+                    110 [label="Exit block"];
+                }
+                111 [label="Exit when branch result"];
+                112 [label="Enter when branch result"];
+                subgraph cluster_30 {
+                    color=blue
+                    113 [label="Enter block"];
+                    114 [label="Function call: R|/B.B|()"];
+                    115 [label="Exit block"];
+                }
+                116 [label="Exit when branch result"];
+                117 [label="Exit when"];
+            }
+            118 [label="Variable declaration: lval b: R|B|"];
+            119 [label="Access variable R|<local>/b|"];
+            120 [label="Function call: R|/takeB|(...)"];
+            121 [label="Exit block"];
+        }
+        122 [label="Exit function test_3" style="filled" fillcolor=red];
+    }
     90 -> {91};
     91 -> {92};
-    92 -> {93 98};
+    92 -> {93};
     93 -> {94};
     94 -> {95};
     95 -> {96};
     96 -> {97};
-    97 -> {86};
+    97 -> {98};
     98 -> {99};
     99 -> {100};
     100 -> {101};
-    101 -> {102};
+    101 -> {112 102};
     102 -> {103};
     103 -> {104};
     104 -> {105};
     105 -> {106};
     106 -> {107};
-    107 -> {86};
+    107 -> {108};
     108 -> {109};
     109 -> {110};
-    110 -> {81};
+    110 -> {111};
+    111 -> {117};
+    112 -> {113};
+    113 -> {114};
+    114 -> {115};
+    115 -> {116};
+    116 -> {117};
+    117 -> {118};
+    118 -> {119};
+    119 -> {120};
+    120 -> {121};
+    121 -> {122};
 
 }

compiler/fir/analysis-tests/testData/resolve/inference/nestedExtensionFunctionType.kt

@@ -0,0 +1,19 @@
+// ISSUE: KT-39034
+
+interface A
+
+fun test_0(a: A, f: A.() -> Unit) {
+    a.f()
+}
+
+fun test_1(a: A, ys: List<A.() -> Unit>) {
+    for (y in ys) {
+        a.y()
+    }
+}
+
+fun test_2(a: A, vararg zs: A.() -> Unit) {
+    for (z in zs) {
+        a.z()
+    }
+}