FIR2IR: wrap do-while loop in IrBlock

"so that variables declared in loop body are not visible outside of the
loop" (from commit d096f1d)

compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt

@@ -728,7 +728,7 @@ class Fir2IrVisitor(
     private val loopMap = mutableMapOf<FirLoop, IrLoop>()
 
     override fun visitDoWhileLoop(doWhileLoop: FirDoWhileLoop, data: Any?): IrElement {
-        return doWhileLoop.convertWithOffsets { startOffset, endOffset ->
+        val irLoop = doWhileLoop.convertWithOffsets { startOffset, endOffset ->
             IrDoWhileLoopImpl(
                 startOffset, endOffset, irBuiltIns.unitType,
                 IrStatementOrigin.DO_WHILE_LOOP
@@ -742,6 +742,9 @@ class Fir2IrVisitor(
         }.also {
             doWhileLoop.accept(implicitCastInserter, it)
         }
+        return IrBlockImpl(irLoop.startOffset, irLoop.endOffset, irBuiltIns.unitType).apply {
+            statements.add(irLoop)
+        }
     }
 
     override fun visitWhileLoop(whileLoop: FirWhileLoop, data: Any?): IrElement {

compiler/testData/ir/irText/declarations/localVarInDoWhile.fir.kt.txt

@@ -1,5 +1,7 @@
 fun foo() {
+  { // BLOCK
     do// COMPOSITE {
     val x: Int = 42
     // }    while (EQEQ(arg0 = x, arg1 = 42).not())
+  }
 }

compiler/testData/ir/irText/declarations/localVarInDoWhile.fir.txt

@@ -1,6 +1,7 @@
 FILE fqName:<root> fileName:/localVarInDoWhile.kt
   FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit
     BLOCK_BODY
+      BLOCK type=kotlin.Unit origin=null
         DO_WHILE label=null origin=DO_WHILE_LOOP
           body: COMPOSITE type=kotlin.Unit origin=DO_WHILE_LOOP
             VAR name:x type:kotlin.Int [val]

compiler/testData/ir/irText/expressions/breakContinue.fir.kt.txt

@@ -1,8 +1,12 @@
 fun test1() {
   while (true) break
+  { // BLOCK
     dobreak    while (true)
+  }
   while (true) continue
+  { // BLOCK
     docontinue    while (true)
+  }
 }
 
 fun test2() {

compiler/testData/ir/irText/expressions/breakContinue.fir.txt

@@ -4,12 +4,14 @@ FILE fqName:<root> fileName:/breakContinue.kt
       WHILE label=null origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
         body: BREAK label=null loop.label=null
+      BLOCK type=kotlin.Unit origin=null
         DO_WHILE label=null origin=DO_WHILE_LOOP
           body: BREAK label=null loop.label=null
           condition: CONST Boolean type=kotlin.Boolean value=true
       WHILE label=null origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
         body: CONTINUE label=null loop.label=null
+      BLOCK type=kotlin.Unit origin=null
         DO_WHILE label=null origin=DO_WHILE_LOOP
           body: CONTINUE label=null loop.label=null
           condition: CONST Boolean type=kotlin.Boolean value=true

compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.kt.txt

@@ -64,6 +64,7 @@ fun test5() {
     i = i.inc()
     i /*~> Unit */
     var j: Int = 0
+    { // BLOCK
       Inner@ do// COMPOSITE {
       j = j.inc()
       j
@@ -71,6 +72,7 @@ fun test5() {
         greaterOrEqual(arg0 = j, arg1 = 3) -> false
         else -> break@Outer
       })
+    }
     when {
       EQEQ(arg0 = i, arg1 = 3) -> break@Outer
     }

compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt

@@ -109,6 +109,7 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
             GET_VAR 'var i: kotlin.Int [var] declared in <root>.test5' type=kotlin.Int origin=null
           VAR name:j type:kotlin.Int [var]
             CONST Int type=kotlin.Int value=0
+          BLOCK type=kotlin.Unit origin=null
             DO_WHILE label=Inner origin=DO_WHILE_LOOP
               body: COMPOSITE type=kotlin.Int origin=DO_WHILE_LOOP
                 SET_VAR 'var j: kotlin.Int [var] declared in <root>.test5' type=kotlin.Unit origin=EQ

compiler/testData/ir/irText/expressions/breakContinueInWhen.fir.kt.txt

@@ -24,9 +24,11 @@ fun testBreakWhile() {
 
 fun testBreakDoWhile() {
   var k: Int = 0
+  { // BLOCK
     dowhen {
       greater(arg0 = k, arg1 = 2) -> break
     }    while (less(arg0 = k, arg1 = 10))
+  }
 }
 
 fun testContinueFor() {
@@ -56,6 +58,7 @@ fun testContinueWhile() {
 fun testContinueDoWhile() {
   var k: Int = 0
   var s: String = ""
+  { // BLOCK
     do// COMPOSITE {
     k = k.inc()
     k /*~> Unit */
@@ -64,6 +67,7 @@ fun testContinueDoWhile() {
     }
     s = s.plus(other = k.toString() + ";")
     // }    while (less(arg0 = k, arg1 = 10))
+  }
   when {
     EQEQ(arg0 = s, arg1 = "1;2;").not() -> throw AssertionError(p0 = s)
   }

compiler/testData/ir/irText/expressions/breakContinueInWhen.fir.txt

@@ -47,6 +47,7 @@ FILE fqName:<root> fileName:/breakContinueInWhen.kt
     BLOCK_BODY
       VAR name:k type:kotlin.Int [var]
         CONST Int type=kotlin.Int value=0
+      BLOCK type=kotlin.Unit origin=null
         DO_WHILE label=null origin=DO_WHILE_LOOP
           body: WHEN type=kotlin.Unit origin=WHEN
             BRANCH
@@ -107,6 +108,7 @@ FILE fqName:<root> fileName:/breakContinueInWhen.kt
         CONST Int type=kotlin.Int value=0
       VAR name:s type:kotlin.String [var]
         CONST String type=kotlin.String value=""
+      BLOCK type=kotlin.Unit origin=null
         DO_WHILE label=null origin=DO_WHILE_LOOP
           body: COMPOSITE type=kotlin.Unit origin=DO_WHILE_LOOP
             SET_VAR 'var k: kotlin.Int [var] declared in <root>.testContinueDoWhile' type=kotlin.Unit origin=EQ

compiler/testData/ir/irText/expressions/whileDoWhile.fir.kt.txt

@@ -12,18 +12,24 @@ fun test() {
     x = <unary>.inc()
     <unary>
   }
+  { // BLOCK
     do// COMPOSITE {
     // }    while (less(arg0 = x, arg1 = 0))
+  }
+  { // BLOCK
     do{ // BLOCK
       val <unary>: Int = x
       x = <unary>.inc()
       <unary>
     }    while (less(arg0 = x, arg1 = 15))
+  }
+  { // BLOCK
     do// COMPOSITE {
     val <unary>: Int = x
     x = <unary>.inc()
     <unary>
     // }    while (less(arg0 = x, arg1 = 20))
+  }
 }
 
 fun testSmartcastInCondition() {
@@ -32,8 +38,10 @@ fun testSmartcastInCondition() {
     a is Boolean -> { // BLOCK
       while (a /*as Boolean */) { // BLOCK
       }
+      { // BLOCK
         do// COMPOSITE {
         // }        while (a /*as Boolean */)
       }
     }
+  }
 }

compiler/testData/ir/irText/expressions/whileDoWhile.fir.txt

@@ -30,11 +30,13 @@ FILE fqName:<root> fileName:/whileDoWhile.kt
             CALL 'public final fun inc (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
               $this: GET_VAR 'val tmp_1: kotlin.Int [val] declared in <root>.test' type=kotlin.Int origin=null
           GET_VAR 'val tmp_1: kotlin.Int [val] declared in <root>.test' type=kotlin.Int origin=null
+      BLOCK type=kotlin.Unit origin=null
         DO_WHILE label=null origin=DO_WHILE_LOOP
           body: COMPOSITE type=kotlin.Unit origin=DO_WHILE_LOOP
           condition: CALL 'public final fun less (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=LT
             arg0: GET_VAR 'var x: kotlin.Int [var] declared in <root>.test' type=kotlin.Int origin=null
             arg1: CONST Int type=kotlin.Int value=0
+      BLOCK type=kotlin.Unit origin=null
         DO_WHILE label=null origin=DO_WHILE_LOOP
           body: BLOCK type=kotlin.Int origin=null
             VAR IR_TEMPORARY_VARIABLE name:tmp_2 type:kotlin.Int [val]
@@ -46,6 +48,7 @@ FILE fqName:<root> fileName:/whileDoWhile.kt
           condition: CALL 'public final fun less (arg0: kotlin.Int, arg1: kotlin.Int): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=LT
             arg0: GET_VAR 'var x: kotlin.Int [var] declared in <root>.test' type=kotlin.Int origin=null
             arg1: CONST Int type=kotlin.Int value=15
+      BLOCK type=kotlin.Unit origin=null
         DO_WHILE label=null origin=DO_WHILE_LOOP
           body: COMPOSITE type=kotlin.Int origin=DO_WHILE_LOOP
             VAR IR_TEMPORARY_VARIABLE name:tmp_3 type:kotlin.Int [val]
@@ -70,6 +73,7 @@ FILE fqName:<root> fileName:/whileDoWhile.kt
               condition: TYPE_OP type=kotlin.Boolean origin=IMPLICIT_CAST typeOperand=kotlin.Boolean
                 GET_VAR 'val a: kotlin.Any? [val] declared in <root>.testSmartcastInCondition' type=kotlin.Any? origin=null
               body: BLOCK type=kotlin.Unit origin=null
+            BLOCK type=kotlin.Unit origin=null
               DO_WHILE label=null origin=DO_WHILE_LOOP
                 body: COMPOSITE type=kotlin.Unit origin=DO_WHILE_LOOP
                 condition: TYPE_OP type=kotlin.Boolean origin=IMPLICIT_CAST typeOperand=kotlin.Boolean

compiler/testData/ir/irText/firProblems/ArrayMap.fir.kt.txt

@@ -223,6 +223,7 @@ internal class ArrayMapImpl<T : Any> : ArrayMap<T> {
           private set
 
         protected override fun computeNext() {
+          { // BLOCK
             do// COMPOSITE {
             val <unary>: Int = <this>.<get-index>()
             <this>.<set-index>(<set-?> = <unary>.inc())
@@ -231,6 +232,7 @@ internal class ArrayMapImpl<T : Any> : ArrayMap<T> {
               less(arg0 = <this>.<get-index>(), arg1 = <this>.<get-data>().<get-size>()) -> EQEQ(arg0 = <this>.<get-data>().get(index = <this>.<get-index>()), arg1 = null)
               else -> false
             })
+          }
           when {
             greaterOrEqual(arg0 = <this>.<get-index>(), arg1 = <this>.<get-data>().<get-size>()) -> <this>.done()
             else -> <this>.setNext(value = <this>.<get-data>().get(index = <this>.<get-index>()) as T)

compiler/testData/ir/irText/firProblems/ArrayMap.fir.txt

@@ -535,6 +535,7 @@ FILE fqName:<root> fileName:/ArrayMap.kt
                   protected abstract fun computeNext (): kotlin.Unit declared in kotlin.collections.AbstractIterator
                 $this: VALUE_PARAMETER name:<this> type:<root>.ArrayMapImpl.iterator.<no name provided><T of <root>.ArrayMapImpl>
                 BLOCK_BODY
+                  BLOCK type=kotlin.Unit origin=null
                     DO_WHILE label=null origin=DO_WHILE_LOOP
                       body: COMPOSITE type=kotlin.Int origin=DO_WHILE_LOOP
                         VAR IR_TEMPORARY_VARIABLE name:tmp_1 type:kotlin.Int [val]