[FIR] Dummy fix of lambda functions inside init block

Init still works not well, but now they at least don't fail

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt

@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.resolve.dfa
 
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.FirResolvedCallableReference
+import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction
 import org.jetbrains.kotlin.fir.declarations.FirAnonymousInitializer
 import org.jetbrains.kotlin.fir.declarations.FirFunction
 import org.jetbrains.kotlin.fir.declarations.FirProperty
@@ -618,7 +619,7 @@ class FirDataFlowAnalyzer(transformer: FirBodyResolveTransformer) : BodyResolveC
     // ----------------------------------- Init block -----------------------------------
 
     fun enterInitBlock(initBlock: FirAnonymousInitializer) {
-        graphBuilder.enterInitBlock(initBlock)
+        graphBuilder.enterInitBlock(initBlock).mergeIncomingFlow()
     }
 
     fun exitInitBlock(initBlock: FirAnonymousInitializer) {
@@ -631,7 +632,7 @@ class FirDataFlowAnalyzer(transformer: FirBodyResolveTransformer) : BodyResolveC
         getOrCreateVariable(leftOperand) to getOrCreateVariable(rightOperand)
 
     private var CFGNode<*>.flow: DelegatingFlow
-        get() = flowOnNodes[this.origin] ?: DelegatingFlow.createDefaultFlow()
+        get() = flowOnNodes.getValue(this.origin)
         set(value) {
             flowOnNodes[this.origin] = value
         }

compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt

@@ -522,6 +522,7 @@ class ControlFlowGraphBuilder {
     // ----------------------------------- Block -----------------------------------
 
     fun enterInitBlock(initBlock: FirAnonymousInitializer): InitBlockEnterNode {
+        graphs.push(ControlFlowGraph("init block"))
         val enterNode = createInitBlockEnterNode(initBlock).also {
             lexicalScopes.push(stackOf(it))
         }
@@ -539,6 +540,7 @@ class ControlFlowGraphBuilder {
             it.markAsDeadIfNecessary()
             lexicalScopes.pop()
             exitNodes.pop()
+            graphs.pop()
         }
     }
 

compiler/fir/resolve/testData/resolve/cfg/initBlockAndInPlaceLambda.dot

@@ -0,0 +1,22 @@
+digraph initBlockAndInPlaceLambda_kt {
+  graph [splines=ortho nodesep=3]
+  node [shape=box penwidth=2]
+  edge [penwidth=2]
+
+  subgraph cluster_0 {
+    color=red
+    0 [label="Enter property" style="filled" fillcolor=red];
+    1 [label="Exit property" style="filled" fillcolor=red];
+  }
+
+  0 -> {1};
+
+  subgraph cluster_1 {
+    color=red
+    2 [label="Enter function <init>" style="filled" fillcolor=red];
+    3 [label="Exit function <init>" style="filled" fillcolor=red];
+  }
+
+  2 -> {3};
+
+}

compiler/fir/resolve/testData/resolve/cfg/initBlockAndInPlaceLambda.kt

@@ -0,0 +1,13 @@
+interface B
+
+interface A {
+    val b: B?
+}
+
+class C(a: A, b: b) {
+    init {
+        val c = a.b?.let {
+            C(a, it)
+        }
+    }
+}

compiler/fir/resolve/testData/resolve/cfg/initBlockAndInPlaceLambda.txt

@@ -0,0 +1,21 @@
+FILE: initBlockAndInPlaceLambda.kt
+    public abstract interface B : R|kotlin/Any| {
+    }
+    public abstract interface A : R|kotlin/Any| {
+        public abstract val b: R|B?|
+            public get(): R|B?|
+
+    }
+    public final class C : R|kotlin/Any| {
+        public constructor(a: R|A|, b: R|class error: Symbol not found, for `b`|): R|C| {
+            super<R|kotlin/Any|>()
+        }
+
+        init {
+            lval c: R|C?| = R|<local>/a|.R|/A.b|?.R|kotlin/let|<R|B|, R|C|>(<L> = let@fun <anonymous>(it: R|B|): R|C| <kind=EXACTLY_ONCE>  {
+                R|/C.C|(R|<local>/a|, R|<local>/it|)
+            }
+            )
+        }
+
+    }

compiler/fir/resolve/testData/resolve/cfg/propertiesAndInitBlocks.dot

@@ -121,78 +121,44 @@ digraph propertiesAndInitBlocks_kt {
 
   subgraph cluster_11 {
     color=red
-    37 [label="Enter init block"];
+    37 [label="Enter function getter" style="filled" fillcolor=red];
     subgraph cluster_12 {
       color=blue
       38 [label="Enter block"];
-      39 [label="Function call: R|java/lang/Exception.Exception|()"];
+      39 [label="Exit block"];
-      40 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-      41 [label="Stub" style="filled" fillcolor=gray];
-      42 [label="Exit block" style="filled" fillcolor=gray];
     }
-    43 [label="Exit init block"];
+    40 [label="Exit function getter" style="filled" fillcolor=red];
-  }
-  subgraph cluster_13 {
-    color=blue
-    44 [label="Enter function getter" style="filled" fillcolor=red];
-    subgraph cluster_14 {
-      color=blue
-      45 [label="Enter block"];
-      46 [label="Exit block"];
-    }
-    47 [label="Exit function getter" style="filled" fillcolor=red];
   }
 
   37 -> {38};
   38 -> {39};
   39 -> {40};
-  40 -> {43};
-  40 -> {41} [style=dotted];
-  41 -> {42} [style=dotted];
-  42 -> {43} [style=dotted];
-  44 -> {45};
-  45 -> {46};
-  46 -> {47};
 
+  subgraph cluster_13 {
+    color=red
+    41 [label="Enter function <init>" style="filled" fillcolor=red];
+    42 [label="Exit function <init>" style="filled" fillcolor=red];
+  }
+
+  41 -> {42};
+
+  subgraph cluster_14 {
+    color=red
+    43 [label="Enter property" style="filled" fillcolor=red];
     subgraph cluster_15 {
-    color=red
+      color=blue
-    48 [label="Enter function <init>" style="filled" fillcolor=red];
+      44 [label="Enter function anonymousFunction"];
-    49 [label="Exit function <init>" style="filled" fillcolor=red];
-  }
-
-  48 -> {49};
-
       subgraph cluster_16 {
-    color=red
-    50 [label="Enter init block"];
-    subgraph cluster_17 {
         color=blue
-      51 [label="Enter block"];
+        45 [label="Enter block"];
-      52 [label="Function call: R|java/lang/Exception.Exception|()"];
+        46 [label="Function call: R|java/lang/Exception.Exception|()"];
-      53 [label="Throw: throw R|java/lang/Exception.Exception|()"];
+        47 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-      54 [label="Stub" style="filled" fillcolor=gray];
+        48 [label="Stub" style="filled" fillcolor=gray];
-      55 [label="Const: Int(1)" style="filled" fillcolor=gray];
+        49 [label="Exit block" style="filled" fillcolor=gray];
-      56 [label="Exit block" style="filled" fillcolor=gray];
       }
-    57 [label="Exit init block"];
+      50 [label="Exit function anonymousFunction" style="filled" fillcolor=gray];
     }
-  subgraph cluster_18 {
+    51 [label="Function call: R|/run|(<L> = run@fun <anonymous>(): R|kotlin/Unit| <kind=EXACTLY_ONCE>  {
-    color=blue
-    58 [label="Enter property" style="filled" fillcolor=red];
-    subgraph cluster_19 {
-      color=blue
-      59 [label="Enter function anonymousFunction"];
-      subgraph cluster_20 {
-        color=blue
-        60 [label="Enter block"];
-        61 [label="Function call: R|java/lang/Exception.Exception|()"];
-        62 [label="Throw: throw R|java/lang/Exception.Exception|()"];
-        63 [label="Stub" style="filled" fillcolor=gray];
-        64 [label="Exit block" style="filled" fillcolor=gray];
-      }
-      65 [label="Exit function anonymousFunction" style="filled" fillcolor=gray];
-    }
-    66 [label="Function call: R|/run|(<L> = run@fun <anonymous>(): R|kotlin/Unit| <kind=EXACTLY_ONCE>  {
     local final fun foo(): R|kotlin/Unit| {
         lval c: R|kotlin/Int| = Int(1).R|kotlin/Int.plus|(Int(1))
         throw R|java/lang/Exception.Exception|()
@@ -213,89 +179,81 @@ digraph propertiesAndInitBlocks_kt {
     throw R|java/lang/Exception.Exception|()
 }
 )" style="filled" fillcolor=gray];
-    67 [label="Exit property" style="filled" fillcolor=red];
+    52 [label="Exit property" style="filled" fillcolor=red];
   }
 
-  50 -> {51};
+  43 -> {44};
-  51 -> {52};
+  44 -> {45};
-  52 -> {53};
+  45 -> {46};
-  53 -> {57};
+  46 -> {47};
-  53 -> {54} [style=dotted];
+  47 -> {52};
-  54 -> {55} [style=dotted];
+  47 -> {48} [style=dotted];
-  55 -> {56} [style=dotted];
+  48 -> {49} [style=dotted];
-  56 -> {57} [style=dotted];
+  49 -> {50} [style=dotted];
-  58 -> {59};
+  50 -> {51} [style=dotted];
-  59 -> {60};
+  51 -> {52} [style=dotted];
-  60 -> {61};
-  61 -> {62};
-  62 -> {67};
-  62 -> {63} [style=dotted];
-  63 -> {64} [style=dotted];
-  64 -> {65} [style=dotted];
-  65 -> {66} [style=dotted];
-  66 -> {67} [style=dotted];
 
-  subgraph cluster_21 {
+  subgraph cluster_17 {
     color=red
-    68 [label="Enter property" style="filled" fillcolor=red];
+    53 [label="Enter property" style="filled" fillcolor=red];
+    subgraph cluster_18 {
+      color=blue
+      54 [label="Try expression enter"];
+      subgraph cluster_19 {
+        color=blue
+        55 [label="Try main block enter"];
+        subgraph cluster_20 {
+          color=blue
+          56 [label="Enter block"];
+          57 [label="Const: Int(1)"];
+          58 [label="Exit block"];
+        }
+        59 [label="Try main block exit"];
+      }
+      subgraph cluster_21 {
+        color=blue
+        60 [label="Enter finally"];
         subgraph cluster_22 {
           color=blue
-      69 [label="Try expression enter"];
+          61 [label="Enter block"];
+          62 [label="Const: Int(0)"];
+          63 [label="Exit block"];
+        }
+        64 [label="Exit finally"];
+      }
       subgraph cluster_23 {
         color=blue
-        70 [label="Try main block enter"];
+        65 [label="Catch enter"];
         subgraph cluster_24 {
           color=blue
-          71 [label="Enter block"];
+          66 [label="Enter block"];
-          72 [label="Const: Int(1)"];
+          67 [label="Const: Int(2)"];
-          73 [label="Exit block"];
+          68 [label="Exit block"];
         }
-        74 [label="Try main block exit"];
+        69 [label="Catch exit"];
       }
-      subgraph cluster_25 {
+      70 [label="Try expression exit"];
-        color=blue
-        75 [label="Enter finally"];
-        subgraph cluster_26 {
-          color=blue
-          76 [label="Enter block"];
-          77 [label="Const: Int(0)"];
-          78 [label="Exit block"];
     }
-        79 [label="Exit finally"];
+    71 [label="Exit property" style="filled" fillcolor=red];
-      }
-      subgraph cluster_27 {
-        color=blue
-        80 [label="Catch enter"];
-        subgraph cluster_28 {
-          color=blue
-          81 [label="Enter block"];
-          82 [label="Const: Int(2)"];
-          83 [label="Exit block"];
-        }
-        84 [label="Catch exit"];
-      }
-      85 [label="Try expression exit"];
-    }
-    86 [label="Exit property" style="filled" fillcolor=red];
   }
 
+  53 -> {54};
+  54 -> {55};
+  55 -> {71 65 60 56};
+  56 -> {57};
+  57 -> {58};
+  58 -> {59};
+  59 -> {70};
+  60 -> {61};
+  61 -> {62};
+  62 -> {63};
+  63 -> {64};
+  64 -> {70};
+  65 -> {71 66};
+  66 -> {67};
+  67 -> {68};
   68 -> {69};
   69 -> {70};
-  70 -> {86 80 75 71};
+  70 -> {71};
-  71 -> {72};
-  72 -> {73};
-  73 -> {74};
-  74 -> {85};
-  75 -> {76};
-  76 -> {77};
-  77 -> {78};
-  78 -> {79};
-  79 -> {85};
-  80 -> {86 81};
-  81 -> {82};
-  82 -> {83};
-  83 -> {84};
-  84 -> {85};
-  85 -> {86};
 
 }

compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirCfgBuildingTestGenerated.java

@@ -51,6 +51,11 @@ public class FirCfgBuildingTestGenerated extends AbstractFirCfgBuildingTest {
             runTest("compiler/fir/resolve/testData/resolve/cfg/initBlock.kt");
         }
 
+        @TestMetadata("initBlockAndInPlaceLambda.kt")
+        public void testInitBlockAndInPlaceLambda() throws Exception {
+            runTest("compiler/fir/resolve/testData/resolve/cfg/initBlockAndInPlaceLambda.kt");
+        }
+
         @TestMetadata("jumps.kt")
         public void testJumps() throws Exception {
             runTest("compiler/fir/resolve/testData/resolve/cfg/jumps.kt");