Magic-Mirror/jadx
1
0
Fork 0
mirror of https://github.com/skylot/jadx.git synced 2024-11-26 22:20:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: don't rerun SSA transform in ConstructorVisitor (#2236)

Browse Source
This commit is contained in:
Skylot 2024-08-02 21:26:25 +01:00
parent 287ba49008
commit 821cc668c7
No known key found for this signature in database
GPG Key ID: 47A4975761262B6A
5 changed files with 51 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java
View File

@ -90,7 +90,6 @@ public enum AFlag {
REQUEST_IF_REGION_OPTIMIZE, // run if region visitor again
REQUEST_CODE_SHRINK,
RERUN_SSA_TRANSFORM,
METHOD_CANDIDATE_FOR_INLINE,
USE_LINES_HINTS, // source lines info in methods can be trusted

3
jadx-core/src/main/java/jadx/core/dex/instructions/PhiInsn.java
View File

@ -43,6 +43,9 @@ public final class PhiInsn extends InsnNode {
if (blockBinds.contains(pred)) {
throw new JadxRuntimeException("Duplicate predecessors in PHI insn: " + pred + ", " + this);
}
if (pred == null) {
throw new JadxRuntimeException("Null bind block in PHI insn: " + this);
}
super.addArg(arg);
blockBinds.add(pred);
}

33
jadx-core/src/main/java/jadx/core/dex/visitors/ConstructorVisitor.java
View File

@ -6,6 +6,7 @@ import jadx.core.codegen.TypeGen;
import jadx.core.dex.attributes.AFlag;
import jadx.core.dex.instructions.InsnType;
import jadx.core.dex.instructions.InvokeNode;
import jadx.core.dex.instructions.PhiInsn;
import jadx.core.dex.instructions.args.InsnArg;
import jadx.core.dex.instructions.args.LiteralArg;
import jadx.core.dex.instructions.args.RegisterArg;
@ -18,6 +19,7 @@ import jadx.core.dex.visitors.ssa.SSATransform;
import jadx.core.dex.visitors.typeinference.TypeInferenceVisitor;
import jadx.core.utils.BlockUtils;
import jadx.core.utils.InsnRemover;
import jadx.core.utils.exceptions.JadxRuntimeException;
@JadxVisitor(
name = "ConstructorVisitor",
@ -34,9 +36,6 @@ public class ConstructorVisitor extends AbstractVisitor {
if (replaceInvoke(mth)) {
MoveInlineVisitor.moveInline(mth);
}
if (mth.contains(AFlag.RERUN_SSA_TRANSFORM)) {
SSATransform.rerun(mth);
}
}
private static boolean replaceInvoke(MethodNode mth) {
@ -75,7 +74,8 @@ public class ConstructorVisitor extends AbstractVisitor {
if (assignInsn != null) {
if (assignInsn.getType() == InsnType.CONSTRUCTOR) {
// arg already used in another constructor instruction
mth.add(AFlag.RERUN_SSA_TRANSFORM);
// insert new PHI insn to merge these branched constructors results
instanceArg = insertPhiInsn(mth, block, instanceArg, ((ConstructorInsn) assignInsn));
} else {
InsnNode newInstInsn = removeAssignChain(mth, assignInsn, remover, InsnType.NEW_INSTANCE);
if (newInstInsn != null) {
@ -99,6 +99,31 @@ public class ConstructorVisitor extends AbstractVisitor {
return true;
}
private static RegisterArg insertPhiInsn(MethodNode mth, BlockNode curBlock,
RegisterArg instArg, ConstructorInsn otherCtr) {
BlockNode otherBlock = BlockUtils.getBlockByInsn(mth, otherCtr);
if (otherBlock == null) {
throw new JadxRuntimeException("Block not found by insn: " + otherCtr);
}
BlockNode crossBlock = BlockUtils.getPathCross(mth, curBlock, otherBlock);
if (crossBlock == null) {
throw new JadxRuntimeException("Path cross not found for blocks: " + curBlock + " and " + otherBlock);
}
RegisterArg newResArg = instArg.duplicateWithNewSSAVar(mth);
RegisterArg useArg = otherCtr.getResult();
RegisterArg otherResArg = useArg.duplicateWithNewSSAVar(mth);
PhiInsn phiInsn = SSATransform.addPhi(mth, crossBlock, useArg.getRegNum());
phiInsn.setResult(useArg.duplicate());
phiInsn.bindArg(newResArg.duplicate(), BlockUtils.getPrevBlockOnPath(crossBlock, curBlock));
phiInsn.bindArg(otherResArg.duplicate(), BlockUtils.getPrevBlockOnPath(crossBlock, otherBlock));
phiInsn.rebindArgs();
otherCtr.setResult(otherResArg.duplicate());
otherCtr.rebindArgs();
return newResArg;
}
private static boolean canRemoveConstructor(MethodNode mth, ConstructorInsn co) {
ClassNode parentClass = mth.getParentClass();
if (co.isSuper() && (co.getArgsCount() == 0 || parentClass.isEnum())) {

21
jadx-core/src/main/java/jadx/core/dex/visitors/ssa/SSATransform.java
View File

@ -44,12 +44,6 @@ public class SSATransform extends AbstractVisitor {
process(mth);
}
public static void rerun(MethodNode mth) {
mth.remove(AFlag.RERUN_SSA_TRANSFORM);
resetSSAVars(mth);
process(mth);
}
private static void process(MethodNode mth) {
if (!mth.getSVars().isEmpty()) {
return;
@ -87,7 +81,8 @@ public class SSATransform extends AbstractVisitor {
for (int id = domFrontier.nextSetBit(0); id >= 0; id = domFrontier.nextSetBit(id + 1)) {
if (!hasPhi.get(id) && la.isLive(id, regNum)) {
BlockNode df = blocks.get(id);
addPhi(mth, df, regNum);
PhiInsn phiInsn = addPhi(mth, df, regNum);
df.getInstructions().add(0, phiInsn);
hasPhi.set(id);
if (!processed.get(id)) {
processed.set(id);
@ -121,7 +116,6 @@ public class SSATransform extends AbstractVisitor {
PhiInsn phiInsn = new PhiInsn(regNum, size);
phiList.getList().add(phiInsn);
phiInsn.setOffset(block.getStartOffset());
block.getInstructions().add(0, phiInsn);
return phiInsn;
}
@ -457,17 +451,6 @@ public class SSATransform extends AbstractVisitor {
}
}
private static void resetSSAVars(MethodNode mth) {
for (SSAVar ssaVar : mth.getSVars()) {
ssaVar.getAssign().resetSSAVar();
ssaVar.getUseList().forEach(RegisterArg::resetSSAVar);
}
for (BlockNode block : mth.getBasicBlocks()) {
block.remove(AType.PHI_LIST);
}
mth.getSVars().clear();
}
private static void removeUnusedInvokeResults(MethodNode mth) {
Iterator<SSAVar> it = mth.getSVars().iterator();
while (it.hasNext()) {

17
jadx-core/src/main/java/jadx/core/utils/BlockUtils.java
View File

@ -434,6 +434,23 @@ public class BlockUtils {
return null;
}
/**
* Return predecessor on path from 'pathStart' block
*/
public static @Nullable BlockNode getPrevBlockOnPath(BlockNode block, BlockNode pathStart) {
List<BlockNode> preds = block.getPredecessors();
if (preds.contains(pathStart)) {
return pathStart;
}
Set<BlockNode> path = getAllPathsBlocks(pathStart, block);
for (BlockNode p : preds) {
if (path.contains(p)) {
return p;
}
}
return null;
}
/**
* Visit blocks on any path from start to end.
* Only one path will be visited!