Conflicts:

src/main/java/info/sigterm/deob/Deob.java src/main/java/info/sigterm/deob/attributes/code/Instructions.java
2015-06-13 11:09:34 -04:00
parent a677e64aac
commit 3140a51f3f
2 changed files with 106 additions and 1 deletions
--- a/src/main/java/info/sigterm/deob/attributes/code/Instructions.java
+++ b/src/main/java/info/sigterm/deob/attributes/code/Instructions.java
@@ -86,6 +86,10 @@ public class Instructions
 	
 	public void buildBlocks()
 	{
+		for (Instruction i : instructions)
+			i.block = null;
+		blocks.clear();
+		
 		Block current = null;
 		for (Instruction i : instructions)
 		{
@@ -132,8 +136,14 @@ public class Instructions
 		out.write(ba);
 	}

-	private void buildJumpGraph()
+	public void buildJumpGraph()
 	{
+		for (Instruction i : instructions)
+		{
+			i.jump.clear();
+			i.from.clear();
+		}
+		
 		for (Instruction i : instructions)
 			if (i instanceof JumpingInstruction)
 				((JumpingInstruction) i).buildJumpGraph();