azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support multiple nested try blocks

Browse Source
This commit is contained in:
Ivan Kylchik
2020-08-07 13:45:48 +03:00
committed by TeamCityServer
parent ad6ba0cf11
commit c3b0c9c6b2
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt
+3 -4
View File
@@ -728,14 +728,13 @@ class IrInterpreter(private val irBuiltIns: IrBuiltIns, private val bodyMap: Map
for (catchBlock in expression.catches) { for (catchBlock in expression.catches) {
if (exception.isSubtypeOf(catchBlock.catchParameter.type.classOrNull!!.owner)) { if (exception.isSubtypeOf(catchBlock.catchParameter.type.classOrNull!!.owner)) {
catchBlock.interpret().check { return it } catchBlock.interpret().check { return it }
break return Next
} }
} }
return Exception
} finally { } 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 { private fun interpretCatch(expression: IrCatch): ExecutionResult {