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 try/catch generator

Browse Source
This commit is contained in:
Alexey Andreev 2015-04-16 23:09:32 +03:00
parent 45b3805a2d
commit b3f662327c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
teavm-core/src/main/java/org/teavm/javascript/Decompiler.java
View File

@ -370,6 +370,8 @@ public class Decompiler {
generator.nextBlock = tmp >= 0 && next < indexer.size() ? program.basicBlockAt(tmp) : null; generator.nextBlock = tmp >= 0 && next < indexer.size() ? program.basicBlockAt(tmp) : null;
} }
closeExpiredBookmarks(generator, generator.currentBlock.getTryCatchBlocks());
List<TryCatchBookmark> inheritedBookmarks = new ArrayList<>(); List<TryCatchBookmark> inheritedBookmarks = new ArrayList<>();
Block block = stack.peek(); Block block = stack.peek();
while (block.end == i) { while (block.end == i) {
@ -419,8 +421,7 @@ public class Decompiler {
stack.push(newBlock); stack.push(newBlock);
block = newBlock; block = newBlock;
} }
createNewBookmarks(generator.currentBlock.getTryCatchBlocks());
updateTryCatchBookmarks(generator, generator.currentBlock.getTryCatchBlocks());
if (node >= 0) { if (node >= 0) {
generator.statements.clear(); generator.statements.clear();
@ -453,7 +454,7 @@ public class Decompiler {
return result; return result;
} }
private void updateTryCatchBookmarks(StatementGenerator generator, List<TryCatchBlock> tryCatchBlocks) { private void closeExpiredBookmarks(StatementGenerator generator, List<TryCatchBlock> tryCatchBlocks) {
tryCatchBlocks = new ArrayList<>(tryCatchBlocks); tryCatchBlocks = new ArrayList<>(tryCatchBlocks);
Collections.reverse(tryCatchBlocks); Collections.reverse(tryCatchBlocks);
@ -510,8 +511,11 @@ public class Decompiler {
tryCatchBookmarks.subList(start, tryCatchBookmarks.size()).clear(); tryCatchBookmarks.subList(start, tryCatchBookmarks.size()).clear();
}
private void createNewBookmarks(List<TryCatchBlock> tryCatchBlocks) {
// Add new bookmarks // Add new bookmarks
for (int i = start; i < tryCatchBlocks.size(); ++i) { for (int i = tryCatchBookmarks.size(); i < tryCatchBlocks.size(); ++i) {
TryCatchBlock tryCatch = tryCatchBlocks.get(i); TryCatchBlock tryCatch = tryCatchBlocks.get(i);
TryCatchBookmark bookmark = new TryCatchBookmark(); TryCatchBookmark bookmark = new TryCatchBookmark();
bookmark.block = stack.peek(); bookmark.block = stack.peek();