Support multiple nested try blocks

2020-08-07 13:45:48 +03:00
parent ad6ba0cf11
commit c3b0c9c6b2
1 changed files with 3 additions and 4 deletions
@@ -728,14 +728,13 @@ class IrInterpreter(private val irBuiltIns: IrBuiltIns, private val bodyMap: Map
            for (catchBlock in expression.catches) {
                if (exception.isSubtypeOf(catchBlock.catchParameter.type.classOrNull!!.owner)) {
                    catchBlock.interpret().check { return it }
-                    break
+                    return Next
                }
            }
+            return Exception
        } finally {
-            expression.finallyExpression?.interpret()?.check { return it }
+            expression.finallyExpression?.takeIf { (it as? IrBlock)?.statements?.isEmpty() != true }?.interpret()?.check { return it }
        }
-
-        return Next
    }

    private fun interpretCatch(expression: IrCatch): ExecutionResult {