From 1e82975a7cd75e77bb91660fcb5a15cf7506efe7 Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Wed, 15 Apr 2020 13:49:31 +0300
Subject: [PATCH] Replace explicit returnLabel call to check call inside try
 interpreter

---
 .../backend/common/interpreter/IrInterpreter.kt  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/interpreter/IrInterpreter.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/interpreter/IrInterpreter.kt
index d27103b55aa..2db80ee77ab 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/interpreter/IrInterpreter.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/interpreter/IrInterpreter.kt
@@ -272,8 +272,8 @@ class IrInterpreter(irModule: IrModuleFragment) {
         val defaultValues = expression.symbol.owner.valueParameters.map { it.defaultValue?.expression }
 
         return stack.newFrame(asSubFrame = true, initPool = pool) {
-            for ((i, valueArgument) in valueArguments.withIndex()) { // TODO zip
-                (valueArgument ?: defaultValues[i])!!.interpret().check { return@newFrame it }
+            for (i in valueArguments.indices) {
+                (valueArguments[i] ?: defaultValues[i])!!.interpret().check { return@newFrame it }
                 with(Variable(valueParametersDescriptors[i], stack.popReturnValue())) {
                     stack.addVar(this)
                     pool.add(this)
@@ -636,18 +636,20 @@ class IrInterpreter(irModule: IrModuleFragment) {
     }
 
     private suspend fun interpretTry(expression: IrTry): ExecutionResult {
-        var executionResult = expression.tryResult.interpret()
-        if (executionResult.returnLabel == ReturnLabel.EXCEPTION) {
+        try {
+            expression.tryResult.interpret().check(ReturnLabel.EXCEPTION) { return it } // if not exception -> return
             val exception = stack.peekReturnValue() as ExceptionState
             for (catchBlock in expression.catches) {
                 if (exception.isSubtypeOf(catchBlock.catchParameter.type.classOrNull!!.owner)) {
-                    executionResult = catchBlock.interpret()
+                    catchBlock.interpret().check { return it }
                     break
                 }
             }
+        } finally {
+            expression.finallyExpression?.interpret()?.check { return it }
         }
-        // TODO check flow correctness; should I return finally result code if in catch there was an exception?
-        return expression.finallyExpression?.interpret() ?: executionResult
+
+        return Next
     }
 
     private suspend fun interpretCatch(expression: IrCatch): ExecutionResult {