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

Exception handling fixed for the case of inner classes

Browse Source
This commit is contained in:
Andrey Breslav
2013-10-07 01:44:29 +04:00
parent 1dfbbb9f08
commit e1e1428f4b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/jetbrains/eval4j/interpreterLoop.kt
+3 -3
View File
@@ -70,9 +70,9 @@ fun interpreterLoop(
fun exceptionCaught(exceptionValue: Value): Boolean { fun exceptionCaught(exceptionValue: Value): Boolean {
val catchBlocks = handlers[m.instructions.indexOf(currentInsn)] ?: listOf() val catchBlocks = handlers[m.instructions.indexOf(currentInsn)] ?: listOf()
for (catch in catchBlocks) { for (catch in catchBlocks) {
val exceptionTypeDesc = catch.`type` val exceptionTypeInternalName = catch.`type`
if (exceptionTypeDesc != null) { if (exceptionTypeInternalName != null) {
val exceptionType = Type.getType(exceptionTypeDesc) val exceptionType = Type.getObjectType(exceptionTypeInternalName)
if (eval.isInstanceOf(exceptionValue, exceptionType)) { if (eval.isInstanceOf(exceptionValue, exceptionType)) {
frame.clearStack() frame.clearStack()
frame.push(exceptionValue) frame.push(exceptionValue)