fix: add labels from NOP instructions in fallback mode (#666)

skylot · May 19, 2019 · 5efe4bd · 5efe4bd
1 parent 75a6714
commit 5efe4bd
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java b/jadx-core/src/main/java/jadx/core/codegen/MethodGen.java
@@ -241,17 +241,21 @@ public void addFallbackMethodCode(CodeWriter code) {
 	}
 
 	public static void addFallbackInsns(CodeWriter code, MethodNode mth, InsnNode[] insnArr, boolean addLabels) {
+		code.incIndent();
 		InsnGen insnGen = new InsnGen(getFallbackMethodGen(mth), true);
 		InsnNode prevInsn = null;
 		for (InsnNode insn : insnArr) {
-			if (insn == null || insn.getType() == InsnType.NOP) {
+			if (insn == null) {
 				continue;
 			}
 			if (addLabels && needLabel(insn, prevInsn)) {
 				code.decIndent();
 				code.startLine(getLabelName(insn.getOffset()) + ':');
 				code.incIndent();
 			}
+			if (insn.getType() == InsnType.NOP) {
+				continue;
+			}
 			try {
 				code.startLine();
 				RegisterArg resArg = insn.getResult();
@@ -272,6 +276,7 @@ public static void addFallbackInsns(CodeWriter code, MethodNode mth, InsnNode[]
 			}
 			prevInsn = insn;
 		}
+		code.decIndent();
 	}
 
 	private static boolean needLabel(InsnNode insn, InsnNode prevInsn) {