ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

works. splitting blocks by instructions jumped to and not checking

Browse Source 
whether inlinable blocks were terminal.
This commit is contained in:
Adam
2015-06-20 18:39:40 -04:00
parent 713db7777f
commit 815b2e2931
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/info/sigterm/deob/attributes/code/Instructions.java
View File

@@ -106,7 +106,6 @@ public class Instructions
{ {
if (current == null || !i.from.isEmpty()) if (current == null || !i.from.isEmpty())
{ {
// this caused exception errors?
if (current != null) if (current != null)
{ {
current.end = current.instructions.get(current.instructions.size() - 1); current.end = current.instructions.get(current.instructions.size() - 1);

2
src/main/java/info/sigterm/deob/deobfuscators/Jumps.java
View File

@@ -34,7 +34,7 @@ public class Jumps
Block block = blocks.get(i); Block block = blocks.get(i);
Block prev = i > 0 ? blocks.get(i - 1) : null; Block prev = i > 0 ? blocks.get(i - 1) : null;
if (block.begin.from.size() == 1 && prev != null && prev.end.isTerminal()) if (block.begin.from.size() == 1 && block.end.isTerminal() && prev != null && prev.end.isTerminal())
{ {
// not sure if this is right, just don't mess with blocks in exception ranges or directly handling them // not sure if this is right, just don't mess with blocks in exception ranges or directly handling them
if (block.exceptions.isEmpty() == false || block.handlers.isEmpty() == false || prev.exceptions.isEmpty() == false || prev.handlers.isEmpty() == false) if (block.exceptions.isEmpty() == false || block.handlers.isEmpty() == false || prev.exceptions.isEmpty() == false || prev.handlers.isEmpty() == false)