Fix bug with exception catch variable

This commit is contained in:
Alexey Andreev 2015-04-18 08:37:22 +03:00
parent eb48c349d0
commit b7c7c2da73

View File

@ -470,10 +470,6 @@ public class Decompiler {
if (!Objects.equals(tryCatch.getExceptionType(), bookmark.exceptionType)) { if (!Objects.equals(tryCatch.getExceptionType(), bookmark.exceptionType)) {
break; break;
} }
if (tryCatch.getExceptionVariable() != null && bookmark.exceptionVariable != null &&
tryCatch.getExceptionVariable().getRegister() != bookmark.exceptionVariable.intValue()) {
break;
}
} }
// Close old bookmarks // Close old bookmarks
@ -523,7 +519,7 @@ public class Decompiler {
bookmark.exceptionHandler = tryCatch.getHandler().getIndex(); bookmark.exceptionHandler = tryCatch.getHandler().getIndex();
bookmark.exceptionType = tryCatch.getExceptionType(); bookmark.exceptionType = tryCatch.getExceptionType();
bookmark.exceptionVariable = tryCatch.getExceptionVariable() != null ? bookmark.exceptionVariable = tryCatch.getExceptionVariable() != null ?
tryCatch.getExceptionVariable().getRegister() : null; tryCatch.getExceptionVariable().getIndex() : null;
bookmark.block.tryCatches.add(bookmark); bookmark.block.tryCatches.add(bookmark);
tryCatchBookmarks.add(bookmark); tryCatchBookmarks.add(bookmark);
} }