jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: support instructions removing in SimplifyVisitor

Browse Source
This commit is contained in:
Skylot
2019-07-13 13:19:58 +03:00
parent fc58022d56
commit 2dbdd1f079
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java
+24 -12
View File
@@ -50,24 +50,36 @@ public class SimplifyVisitor extends AbstractVisitor {
return;
}
for (BlockNode block : mth.getBasicBlocks()) {
List<InsnNode> list = block.getInstructions();
for (int i = 0; i < list.size(); i++) {
InsnNode modInsn = simplifyInsn(mth, list.get(i));
if (modInsn != null) {
if (i != 0 && modInsn.contains(AFlag.ARITH_ONEARG)) {
simplifyBlock(mth, block);
}
}
InsnNode mergedNode = simplifyOneArgConsecutive(
list.get(i - 1), list.get(i), (ArithNode) modInsn);
private static void simplifyBlock(MethodNode mth, BlockNode block) {
List<InsnNode> list = block.getInstructions();
for (int i = 0; i < list.size(); i++) {
InsnNode insn = list.get(i);
int insnCount = list.size();
InsnNode modInsn = simplifyInsn(mth, insn);
if (modInsn != null) {
if (i != 0 && modInsn.contains(AFlag.ARITH_ONEARG)) {
InsnNode mergedNode = simplifyOneArgConsecutive(
list.get(i - 1), list.get(i), (ArithNode) modInsn);
if (mergedNode != null) {
list.remove(i - 1);
modInsn = mergedNode;
i--;
}
if (mergedNode != null) {
list.remove(i - 1);
modInsn = mergedNode;
i--;
}
}
if (i < list.size() && list.get(i) == insn) {
list.set(i, modInsn);
}
}
if (list.size() < insnCount) {
// some insns removed => restart block processing
simplifyBlock(mth, block);
return;
}
}
}