Copy common utils from Native

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrBlock.kt

@@ -16,6 +16,10 @@
 
 package org.jetbrains.kotlin.ir.expressions
 
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
+import org.jetbrains.kotlin.ir.declarations.IrSymbolOwner
+import org.jetbrains.kotlin.ir.symbols.IrReturnableBlockSymbol
+
 interface IrContainerExpression : IrExpression, IrStatementContainer {
     val origin: IrStatementOrigin?
     val isTransparentScope: Boolean
@@ -30,3 +34,9 @@ interface IrComposite : IrContainerExpression {
     override val isTransparentScope: Boolean
         get() = true
 }
+
+interface IrReturnableBlock: IrBlock, IrSymbolOwner {
+    override val symbol: IrReturnableBlockSymbol
+    val descriptor: FunctionDescriptor
+    val sourceFileName: String
+}

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrBlockImpl.kt

@@ -16,9 +16,15 @@
 
 package org.jetbrains.kotlin.ir.expressions.impl
 
+import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.expressions.IrBlock
+import org.jetbrains.kotlin.ir.expressions.IrReturnableBlock
 import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
+import org.jetbrains.kotlin.ir.symbols.IrReturnableBlockSymbol
+import org.jetbrains.kotlin.ir.symbols.impl.IrBindableSymbolBase
+import org.jetbrains.kotlin.ir.symbols.impl.IrReturnableBlockSymbolImpl
+import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 import org.jetbrains.kotlin.types.KotlinType
 
@@ -44,4 +50,44 @@ fun IrBlockImpl.inlineStatement(statement: IrStatement) {
     else {
         statements.add(statement)
     }
+}
+
+
+class IrReturnableBlockImpl(startOffset: Int, endOffset: Int, type: KotlinType,
+                            override val symbol: IrReturnableBlockSymbol, origin: IrStatementOrigin? = null, override val sourceFileName: String = "no source file")
+    : IrContainerExpressionBase(startOffset, endOffset, type, origin), IrReturnableBlock {
+    override val descriptor = symbol.descriptor
+
+    constructor(startOffset: Int, endOffset: Int, type: KotlinType,
+                symbol: IrReturnableBlockSymbol, origin: IrStatementOrigin?, statements: List<IrStatement>, sourceFileName: String = "no source file") :
+            this(startOffset, endOffset, type, symbol, origin, sourceFileName) {
+        this.statements.addAll(statements)
+    }
+
+    constructor(startOffset: Int, endOffset: Int, type: KotlinType,
+                descriptor: FunctionDescriptor, origin: IrStatementOrigin? = null, sourceFileName: String = "no source file") :
+            this(startOffset, endOffset, type, IrReturnableBlockSymbolImpl(descriptor), origin, sourceFileName)
+
+    constructor(startOffset: Int, endOffset: Int, type: KotlinType,
+                descriptor: FunctionDescriptor, origin: IrStatementOrigin?, statements: List<IrStatement>, sourceFileName: String = "no source file") :
+            this(startOffset, endOffset, type, descriptor, origin, sourceFileName) {
+        this.statements.addAll(statements)
+    }
+
+    init {
+        symbol.bind(this)
+    }
+
+    override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R =
+            visitor.visitBlock(this, data)
+
+    override fun <D> acceptChildren(visitor: IrElementVisitor<Unit, D>, data: D) {
+        statements.forEach { it.accept(visitor, data) }
+    }
+
+    override fun <D> transformChildren(transformer: IrElementTransformer<D>, data: D) {
+        statements.forEachIndexed { i, irStatement ->
+            statements[i] = irStatement.transform(transformer, data)
+        }
+    }
 }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrSymbol.kt

@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.ir.symbols
 
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.expressions.IrReturnableBlock
 
 interface IrSymbol {
     val owner : IrSymbolOwner
@@ -59,4 +60,6 @@ interface IrFunctionSymbol : IrSymbol {
     override val descriptor: FunctionDescriptor
 }
 interface IrConstructorSymbol : IrFunctionSymbol, IrBindableSymbol<ClassConstructorDescriptor, IrConstructor>
-interface IrSimpleFunctionSymbol : IrFunctionSymbol, IrBindableSymbol<FunctionDescriptor, IrSimpleFunction>
+interface IrSimpleFunctionSymbol : IrFunctionSymbol, IrBindableSymbol<FunctionDescriptor, IrSimpleFunction>
+
+interface IrReturnableBlockSymbol : IrFunctionSymbol, IrBindableSymbol<FunctionDescriptor, IrReturnableBlock>

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/impl/IrSymbolBase.kt

@@ -17,8 +17,15 @@
 package org.jetbrains.kotlin.ir.symbols.impl
 
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.ir.IrStatement
 import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.expressions.IrReturnableBlock
+import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
+import org.jetbrains.kotlin.ir.expressions.impl.IrContainerExpressionBase
 import org.jetbrains.kotlin.ir.symbols.*
+import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
+import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
+import org.jetbrains.kotlin.types.KotlinType
 
 abstract class IrSymbolBase<out D : DeclarationDescriptor>(override val descriptor: D) : IrSymbol
 
@@ -110,4 +117,8 @@ fun createFunctionSymbol(descriptor: CallableMemberDescriptor): IrFunctionSymbol
             is ClassConstructorDescriptor -> IrConstructorSymbolImpl(descriptor.original)
             is FunctionDescriptor -> IrSimpleFunctionSymbolImpl(descriptor.original)
             else -> throw IllegalArgumentException("Unexpected descriptor kind: $descriptor")
-        }
+        }
+
+class IrReturnableBlockSymbolImpl(descriptor: FunctionDescriptor) :
+        IrBindableSymbolBase<FunctionDescriptor, IrReturnableBlock>(descriptor),
+        IrReturnableBlockSymbol