From eba08c567413c6316f8cd45ab30fb78b519bc51b Mon Sep 17 00:00:00 2001
From: Konstantin Anisimov <konstantin.anisimov@jetbrains.com>
Date: Wed, 11 Jan 2017 16:21:42 +0700
Subject: [PATCH] New "return" remove scheme

---
 .../kotlin/backend/konan/lower/FunctionInlining.kt   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
index 5c41d1a313e..5e14d853522 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/lower/FunctionInlining.kt
@@ -37,10 +37,10 @@ internal class FunctionInlining(val context: Context): IrElementTransformerVoid(
         val copyFuncDeclaration = functionDeclaration.accept(DeepCopyIrTree(), null) as IrFunction // Create copy of the function.
 
         val body        = copyFuncDeclaration.body!! as IrBlockBody
-        val statements  = removeReturn(body.statements)                                     // Replace "return" with its value.
         val startOffset = copyFuncDeclaration.startOffset
         val endOffset   = copyFuncDeclaration.endOffset
         val returnType  = copyFuncDeclaration.descriptor.returnType!!
+        val statements  = body.statements
         val irBlock     = IrBlockImpl(startOffset, endOffset, returnType, null, statements) // Create IrBlock containing function statements.
 
         val parameterToExpression = expression.getArguments()                               // Build map parameter -> expression.
@@ -63,6 +63,14 @@ internal class ParametersTransformer(val parameterToExpression: List <Pair<Param
 
     //-------------------------------------------------------------------------//
 
+    override fun visitReturn(expression: IrReturn): IrExpression {
+
+        val transformedExpression = super.visitReturn(expression) as IrReturn
+        return transformedExpression.value
+    }
+
+    //-------------------------------------------------------------------------//
+
     override fun visitGetValue(expression: IrGetValue): IrExpression {
         val descriptor = expression.descriptor
         if (descriptor !is ParameterDescriptor) {                                           // TODO do we need this check?
@@ -71,4 +79,4 @@ internal class ParametersTransformer(val parameterToExpression: List <Pair<Param
         val parExp = parameterToExpression.find { it.first == descriptor }                  // Find expression to replace this parameter.
         return parExp?.let { parExp.second } ?: super.visitGetValue(expression)             // TODO should we proceed with IR iteration here?
     }
-}
\ No newline at end of file
+}