eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug in decompiling nested catch blocks with complex control flow

Browse Source
This commit is contained in:
Alexey Andreev 2017-12-03 18:39:57 +03:00
parent 7b989a4c1c
commit c15709994f
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/teavm/ast/decompilation/Decompiler.java
View File

@ -415,7 +415,7 @@ public class Decompiler {
}
}
for (int j = oldBlock.tryCatches.size() - 1; j >= 0; --j) {
for (int j = 0; j < oldBlock.tryCatches.size(); ++j) {
TryCatchBookmark bookmark = oldBlock.tryCatches.get(j);
TryCatchStatement tryCatchStmt = new TryCatchStatement();
tryCatchStmt.setExceptionType(bookmark.exceptionType);
@ -428,7 +428,7 @@ public class Decompiler {
if (!tryCatchStmt.getProtectedBody().isEmpty()) {
blockPart.add(tryCatchStmt);
}
inheritedBookmarks.add(bookmark);
inheritedBookmarks.add(0, bookmark);
}
oldBlock.tryCatches.clear();
}

18
tests/src/test/java/org/teavm/vm/VMTest.java
View File

@ -101,6 +101,24 @@ public class VMTest {
assertEquals("before;inside;after;finally;", sb.toString());
}
@Test
public void catchFinally() {
StringBuilder sb = new StringBuilder();
try {
if (Integer.parseInt("invalid") > 0) {
sb.append("err1;");
} else {
sb.append("err2;");
}
sb.append("err3");
} catch (NumberFormatException e) {
sb.append("catch;");
} finally {
sb.append("finally;");
}
assertEquals("catch;finally;", sb.toString());
}
@Test
public void surrogateInStringLiteralsWork() {
assertEquals(0xDDC2, "a\uDDC2b".charAt(1));