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

core: fix processing of debug info (if local variable used before declaring a debug info)

Browse Source
This commit is contained in:
NeoSpb
2015-01-13 19:42:57 +03:00
parent b4767626d9
commit 733836ea2d
2 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/dex/nodes/parser/DebugInfoParser.java
+15
View File
@@ -212,6 +212,21 @@ public class DebugInfoParser {
prev.end(addr, line);
setVar(prev);
}
RegisterArg activeReg = (RegisterArg) activeRegisters[var.getRegNum()];
if (activeReg != null) {
SSAVar ssaVar = activeReg.getSVar();
if ((ssaVar != null) && (ssaVar.getStartAddr() != -1)) {
if (ssaVar.getAssign() != null) {
if (ssaVar.getAssign().getParentInsn() != null) {
if (ssaVar.getAssign().getParentInsn().getOffset() >= 0) {
addr = ssaVar.getAssign().getParentInsn().getOffset();
}
}
}
}
}
var.start(addr, line);
locals[regNum] = var;
}
jadx-core/src/main/java/jadx/core/dex/visitors/SimplifyVisitor.java
+24 -1
View File
@@ -21,6 +21,7 @@ import jadx.core.dex.nodes.BlockNode;
import jadx.core.dex.nodes.InsnNode;
import jadx.core.dex.nodes.MethodNode;
import jadx.core.dex.regions.conditions.IfCondition;
import jadx.core.utils.InsnUtils;
import java.util.ArrayList;
import java.util.Collections;
@@ -78,9 +79,31 @@ public class SimplifyVisitor extends AbstractVisitor {
case CHECK_CAST:
InsnArg castArg = insn.getArg(0);
ArgType castArgType = castArg.getType();
/*
* Don't removes CHECK_CAST for wrapped INVOKE
* if invoked method returns different type
*/
if (castArg.isInsnWrap()) {
InsnWrapArg castWrapArg = (InsnWrapArg) castArg;
InsnNode wrapInsn = castWrapArg.getWrapInsn();
if (wrapInsn.getType() == InsnType.INVOKE) {
InvokeNode invkInsn = (InvokeNode) wrapInsn;
castArgType = invkInsn.getCallMth().getReturnType();
if (invkInsn.getResult().getType()
!= invkInsn.getCallMth().getReturnType()) {
LOG.warn("Invoke without cast at {} in {}", InsnUtils.formatOffset(invkInsn.getOffset()), mth);
}
}
}
ArgType castType = (ArgType) ((IndexInsnNode) insn).getIndex();
if (!ArgType.isCastNeeded(castArg.getType(), castType)) {
if (!ArgType.isCastNeeded(castArgType, castType)) {
InsnNode insnNode = new InsnNode(InsnType.MOVE, 1);
insnNode.setOffset(insn.getOffset());
insnNode.setResult(insn.getResult());
insnNode.addArg(castArg);
return insnNode;