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

fix: cover more situations for SwitchOverString (PR #2860)

Browse Source
This commit is contained in:
ewt45
2026-04-28 02:36:06 +08:00
committed by GitHub
parent 55e79fb70f
commit 21aa90c5d1
6 changed files with 700 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/dex/visitors/regions/SwitchOverStringVisitor.java
+350 -332
View File
@@ -2,13 +2,11 @@ package jadx.core.dex.visitors.regions;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
import org.jetbrains.annotations.Nullable;
@@ -16,15 +14,13 @@ import jadx.api.plugins.input.data.annotations.EncodedType;
import jadx.api.plugins.input.data.annotations.EncodedValue;
import jadx.api.plugins.input.data.attributes.JadxAttrType;
import jadx.core.dex.attributes.AFlag;
import jadx.core.dex.attributes.IAttributeNode;
import jadx.core.dex.attributes.nodes.CodeFeaturesAttr;
import jadx.core.dex.attributes.nodes.CodeFeaturesAttr.CodeFeature;
import jadx.core.dex.info.MethodInfo;
import jadx.core.dex.instructions.IfNode;
import jadx.core.dex.instructions.IfOp;
import jadx.core.dex.instructions.InsnType;
import jadx.core.dex.instructions.InvokeNode;
import jadx.core.dex.instructions.PhiInsn;
import jadx.core.dex.instructions.SwitchInsn;
import jadx.core.dex.instructions.args.InsnArg;
import jadx.core.dex.instructions.args.InsnWrapArg;
import jadx.core.dex.instructions.args.LiteralArg;
@@ -37,18 +33,22 @@ import jadx.core.dex.nodes.IRegion;
import jadx.core.dex.nodes.InsnNode;
import jadx.core.dex.nodes.MethodNode;
import jadx.core.dex.regions.SwitchRegion;
import jadx.core.dex.regions.conditions.Compare;
import jadx.core.dex.regions.conditions.IfCondition;
import jadx.core.dex.regions.conditions.IfRegion;
import jadx.core.dex.visitors.AbstractVisitor;
import jadx.core.dex.visitors.JadxVisitor;
import jadx.core.utils.BlockUtils;
import jadx.core.utils.InsnRemover;
import jadx.core.utils.InsnUtils;
import jadx.core.utils.ListUtils;
import jadx.core.utils.RegionUtils;
import jadx.core.utils.Utils;
import jadx.core.utils.exceptions.JadxException;
/**
* A switch(string) java code will be compiled to two switches in class code.
* Sometimes, android's d8/r8 will make some further modification.
* 1st switch could be changed to ifs to reduce size of dex.
* 2nd switch could be flattened and removed if there are many cases using a same block.
*/
@JadxVisitor(
name = "SwitchOverStringVisitor",
desc = "Restore switch over string",
@@ -56,6 +56,7 @@ import jadx.core.utils.exceptions.JadxException;
runBefore = ReturnVisitor.class
)
public class SwitchOverStringVisitor extends AbstractVisitor implements IRegionIterativeVisitor {
private static final Integer DEFAULT_NUM_VALUE = -1;
@Override
public void visit(MethodNode mth) throws JadxException {
@@ -67,63 +68,50 @@ public class SwitchOverStringVisitor extends AbstractVisitor implements IRegionI
@Override
public boolean visitRegion(MethodNode mth, IRegion region) {
if (region instanceof SwitchRegion) {
return restoreSwitchOverString(mth, (SwitchRegion) region);
if (region instanceof SwitchRegion || region instanceof IfRegion) {
return restoreSwitchOverString(mth, region);
}
return false;
}
private boolean restoreSwitchOverString(MethodNode mth, SwitchRegion switchRegion) {
private boolean restoreSwitchOverString(MethodNode mth, IRegion part1Region) {
try {
InsnNode swInsn = BlockUtils.getLastInsnWithType(switchRegion.getHeader(), InsnType.SWITCH);
if (swInsn == null) {
InsnNode strHashInsn = BlockUtils.getLastInsn(RegionUtils.getFirstBlockNode(part1Region));
InvokeNode hashcodeInv = strHashInsn == null ? null : getStrHashcodeInvokeInsn(strHashInsn.getArg(0));
InsnArg strArg = hashcodeInv == null ? null : hashcodeInv.getInstanceArg();
if (strArg == null || !strArg.isRegister()) {
return false;
}
RegisterArg strArg = getStrHashCodeArg(swInsn.getArg(0));
if (strArg == null) {
return false;
}
int casesCount = switchRegion.getCases().size();
boolean defaultCaseAdded = switchRegion.getCases().stream().anyMatch(SwitchRegion.CaseInfo::isDefaultCase);
int casesWithString = defaultCaseAdded ? casesCount - 1 : casesCount;
SSAVar strVar = strArg.getSVar();
if (strVar.getUseCount() - 1 < casesWithString) {
// one 'hashCode' invoke and at least one 'equals' per case
return false;
}
// quick checks done, start collecting data to create a new switch region
Map<InsnNode, String> strEqInsns = collectEqualsInsns(mth, strVar);
if (strEqInsns.size() < casesWithString) {
return false;
}
SwitchData switchData = new SwitchData(mth, switchRegion);
switchData.setStrEqInsns(strEqInsns);
switchData.setCases(new ArrayList<>(casesCount));
for (SwitchRegion.CaseInfo swCaseInfo : switchRegion.getCases()) {
if (!processCase(switchData, swCaseInfo)) {
mth.addWarnComment("Failed to restore switch over string. Please report as a decompilation issue");
SwitchData data = new SwitchData(mth, part1Region);
data.setHashcodeInvokeInsn(hashcodeInv);
data.setStrArg((RegisterArg) strArg);
IContainer nextContainer = RegionUtils.getNextContainer(mth, part1Region);
boolean isPart1Switch = part1Region instanceof SwitchRegion;
boolean isPart2Switch = nextContainer instanceof SwitchRegion;
if (isPart2Switch) {
SwitchRegion part2Region = (SwitchRegion) nextContainer;
InsnNode part2SwInsn = BlockUtils.getLastInsnWithType(part2Region.getHeader(), InsnType.SWITCH);
if (part2SwInsn == null || !part2SwInsn.getArg(0).isRegister()) {
return false;
}
data.setType(isPart1Switch ? SwitchStringType.SWITCH_SWITCH : SwitchStringType.IF_SWITCH);
data.setPart2Region(part2Region);
data.setNumArg((RegisterArg) part2SwInsn.getArg(0));
} else if (isPart1Switch) {
data.setType(SwitchStringType.SINGLE_SWITCH);
} else {
return false;
}
// match remapping var to collect code from second switch
if (!mergeWithCode(switchData)) {
if (!collectPart1RegionCases(data)) {
return false;
}
if (!prepareMergedSwitchCases(data) || !replaceWithMergedSwitch(data)) {
mth.addWarnComment("Failed to restore switch over string. Please report as a decompilation issue");
return false;
}
// all checks passed, replace with new switch
IRegion parentRegion = switchRegion.getParent();
SwitchRegion replaceRegion = new SwitchRegion(parentRegion, switchRegion.getHeader());
for (SwitchRegion.CaseInfo caseInfo : switchData.getNewCases()) {
replaceRegion.addCase(Collections.unmodifiableList(caseInfo.getKeys()), caseInfo.getContainer());
}
if (!parentRegion.replaceSubBlock(switchRegion, replaceRegion)) {
mth.addWarnComment("Failed to restore switch over string. Please report as a decompilation issue");
return false;
}
// replace confirmed, remove original code
markCodeForRemoval(switchData);
// use string arg directly in switch
swInsn.replaceArg(swInsn.getArg(0), strArg.duplicate());
return true;
} catch (StackOverflowError | Exception e) {
mth.addWarnComment("Failed to restore switch over string. Please report as a decompilation issue", e);
@@ -131,17 +119,223 @@ public class SwitchOverStringVisitor extends AbstractVisitor implements IRegionI
}
}
private static void markCodeForRemoval(SwitchData switchData) {
MethodNode mth = switchData.getMth();
try {
switchData.getToRemove().forEach(i -> i.add(AFlag.REMOVE));
SwitchRegion codeSwitch = switchData.getCodeSwitch();
if (codeSwitch != null) {
IRegion parentRegion = switchData.getSwitchRegion().getParent();
parentRegion.getSubBlocks().remove(codeSwitch);
codeSwitch.getHeader().add(AFlag.REMOVE);
/**
* store str and num/caseBlock in switchData
* validate:
* - case key is hashcode of strValue
* - case block is str.equals compare
* - str compare thenBlock is num assign (SWITCH_SWITCH and IF_SWITCH)
*/
private static boolean collectPart1RegionCases(SwitchData data) {
// a map of hashcode keys and case blocks
Map<Integer, BlockNode> hashCases = new LinkedHashMap<>();
if (data.getType() == SwitchStringType.IF_SWITCH) {
IfRegion part1If = (IfRegion) data.getPart1Region();
BlockNode part2Header = Objects.requireNonNull(data.getPart2Region()).getHeader();
RegisterArg strHashArg = null;
BlockNode ifStartBlock = part1If.getConditionBlocks().get(0);
BlockNode hashCmpBlock = getOnlyOneInsnBlock(ifStartBlock);
do {
IfNode ifNode = (IfNode) BlockUtils.getLastInsnWithType(hashCmpBlock, InsnType.IF);
if (ifNode == null || (ifNode.getOp() != IfOp.NE && ifNode.getOp() != IfOp.EQ)) {
return false;
}
boolean isNE = ifNode.getOp() == IfOp.NE;
BlockNode thenBlock = getOnlyOneInsnBlock(isNE ? ifNode.getElseBlock() : ifNode.getThenBlock());
BlockNode elseBlock = getOnlyOneInsnBlock(isNE ? ifNode.getThenBlock() : ifNode.getElseBlock());
if (thenBlock == null || elseBlock == null || !ifNode.getArg(0).isRegister() || !ifNode.getArg(1).isLiteral()) {
return false;
}
RegisterArg tmpStrHashArg = (RegisterArg) ifNode.getArg(0);
LiteralArg literalArg = (LiteralArg) ifNode.getArg(1);
if (strHashArg == null) {
strHashArg = tmpStrHashArg;
} else if (!strHashArg.sameCodeVar(tmpStrHashArg)) {
return false;
}
hashCases.put((int) literalArg.getLiteral(), thenBlock);
hashCmpBlock = elseBlock;
// end of part1If: no further hash compare, next block is part2switch
Integer fallbackNum = extractConstNumber(data, BlockUtils.getLastInsn(hashCmpBlock));
BlockNode nextBlock = BlockUtils.getNextBlock(hashCmpBlock);
if (elseBlock == part2Header || (DEFAULT_NUM_VALUE.equals(fallbackNum) && nextBlock == part2Header)) {
break;
}
} while (true);
} else {
SwitchRegion part1Switch = (SwitchRegion) data.getPart1Region();
SwitchInsn swInsn = (SwitchInsn) BlockUtils.getLastInsnWithType(part1Switch.getHeader(), InsnType.SWITCH);
Objects.requireNonNull(swInsn);
for (int i = 0; i < swInsn.getKeys().length; i++) {
BlockNode caseBlock = getOnlyOneInsnBlock(swInsn.getTargetBlocks()[i]);
if (caseBlock == null) {
return false;
}
hashCases.put(swInsn.getKeys()[i], caseBlock);
}
RegisterArg numArg = switchData.getNumArg();
}
// save to switchData
data.setCases(new ArrayList<>(hashCases.size()));
for (Integer hashcode : hashCases.keySet()) {
BlockNode caseBlock = hashCases.get(hashcode);
IfNode ifStrEqualsInsn = (IfNode) BlockUtils.getLastInsnWithType(caseBlock, InsnType.IF);
if (!isIfStringEqualsInsn(ifStrEqualsInsn)) {
return false;
}
do {
InsnNode strEqualsInsn = InsnUtils.getWrappedInsn(ifStrEqualsInsn.getArg(0));
Objects.requireNonNull(strEqualsInsn);
InsnArg strArg = strEqualsInsn.getArg(0);
InsnArg valArg = strEqualsInsn.getArg(1);
Object strValue = InsnUtils.getConstValueByArg(data.getMth().root(), valArg);
if (!data.getStrArg().equals(strArg) || !(strValue instanceof String) || strValue.hashCode() != hashcode) {
return false;
}
boolean isCmpNE = (ifStrEqualsInsn.getOp() == IfOp.EQ) != ifStrEqualsInsn.getArg(1).isTrue();
BlockNode thenBlock = isCmpNE ? ifStrEqualsInsn.getElseBlock() : ifStrEqualsInsn.getThenBlock();
BlockNode elseBlock = isCmpNE ? ifStrEqualsInsn.getThenBlock() : ifStrEqualsInsn.getElseBlock();
Integer numValue = null;
if (data.getType() == SwitchStringType.SWITCH_SWITCH || data.getType() == SwitchStringType.IF_SWITCH) {
InsnNode numInsn = BlockUtils.getLastInsn(getOnlyOneInsnBlock(thenBlock));
RegisterArg numArg = Objects.requireNonNull(data.getNumArg());
if (thenBlock != null && (numInsn == null || numInsn.getType() == InsnType.SWITCH)) {
// num is assigned before 1st region. find nearest assign
BlockNode iDom = thenBlock.getIDom();
while (iDom != null && numValue == null) {
for (InsnNode insn : iDom.getInstructions()) {
numValue = extractConstNumber(data, insn);
}
iDom = iDom.getIDom();
}
if (numValue == null) {
return false;
}
} else if (numInsn != null && numArg.sameCodeVar(numInsn.getResult())) {
numValue = extractConstNumber(data, numInsn);
} else {
return false;
}
}
// store str and num assign in switchData
data.getCases().add(new CaseData(strValue, numValue, thenBlock));
// there may be more string compare (same hashcode)
BlockNode nextIfBlock = getOnlyOneInsnBlock(elseBlock);
ifStrEqualsInsn = (IfNode) BlockUtils.getLastInsnWithType(nextIfBlock, InsnType.IF);
} while (isIfStringEqualsInsn(ifStrEqualsInsn));
}
return true;
}
/**
* create cases according to part2Region (part1Region if is SINGLE_SWITCH).
* replace keys with strings.
*/
private static boolean prepareMergedSwitchCases(SwitchData data) {
SwitchRegion part2Region = data.getPart2Region();
List<CaseData> cases = data.getCases();
List<SwitchRegion.CaseInfo> newCases = new ArrayList<>();
data.setNewCases(newCases);
if (data.getType() == SwitchStringType.SWITCH_SWITCH || data.getType() == SwitchStringType.IF_SWITCH) {
// group by num
Map<Integer, List<Object>> casesMap = new HashMap<>(cases.size());
for (CaseData caseData : cases) {
casesMap.computeIfAbsent(caseData.getCodeNum(), v -> new ArrayList<>()).add(caseData.getStrValue());
}
for (SwitchRegion.CaseInfo caseInfo : Objects.requireNonNull(part2Region).getCases()) {
SwitchRegion.CaseInfo newCase = new SwitchRegion.CaseInfo(new ArrayList<>(), caseInfo.getContainer());
for (Object key : caseInfo.getKeys()) {
Integer intKey = unwrapIntKey(key);
if (key != SwitchRegion.DEFAULT_CASE_KEY) {
List<Object> strings = casesMap.remove(Objects.requireNonNull(intKey));
if (strings == null || strings.isEmpty()) {
return false;
}
newCase.getKeys().addAll(strings);
} else {
// last case. add all remaining strings
for (List<Object> strings : casesMap.values()) {
newCase.getKeys().addAll(strings);
}
casesMap.clear();
newCase.getKeys().add(SwitchRegion.DEFAULT_CASE_KEY);
}
}
newCases.add(newCase);
}
if (!casesMap.isEmpty()) {
data.getMth().addWarnComment("switch over string: strings are not added: " + casesMap.values());
}
} else if (data.getType() == SwitchStringType.SINGLE_SWITCH) {
SwitchRegion part1Region = (SwitchRegion) data.getPart1Region();
SwitchInsn swInsn = (SwitchInsn) BlockUtils.getLastInsnWithType(part1Region.getHeader(), InsnType.SWITCH);
BlockNode defBlock = Objects.requireNonNull(swInsn).getDefTargetBlock();
if (defBlock != null) {
cases.add(new CaseData(SwitchRegion.DEFAULT_CASE_KEY, DEFAULT_NUM_VALUE, defBlock));
}
CaseData lastCaseData = null;
for (CaseData caseData : cases) {
if (lastCaseData != null && lastCaseData.getCode() == caseData.getCode()) {
// combine cases whose blocks are the same
SwitchRegion.CaseInfo lastInfo = Objects.requireNonNull(ListUtils.last(newCases));
lastInfo.getKeys().add(caseData.getStrValue());
} else {
IContainer container = RegionUtils.getBlockContainer(part1Region, caseData.getCode());
if (container == null) {
return false;
}
SwitchRegion.CaseInfo newInfo = new SwitchRegion.CaseInfo(new ArrayList<>(), container);
newInfo.getKeys().add(caseData.getStrValue());
newCases.add(newInfo);
}
lastCaseData = caseData;
}
}
return true;
}
/** replace with new switch. remove original code */
private static boolean replaceWithMergedSwitch(SwitchData data) {
MethodNode mth = data.getMth();
IRegion part1Region = data.getPart1Region();
IRegion part1Parent = part1Region.getParent();
SwitchRegion part2Region = data.getPart2Region();
List<InsnNode> keptInsns = new ArrayList<>();
BlockNode newHeader;
if (data.getType() == SwitchStringType.SWITCH_SWITCH || data.getType() == SwitchStringType.SINGLE_SWITCH) {
newHeader = ((SwitchRegion) part1Region).getHeader();
} else {
newHeader = Objects.requireNonNull(part2Region).getHeader();
}
// use string arg directly in switch
InsnNode swInsn = BlockUtils.getLastInsnWithType(newHeader, InsnType.SWITCH);
InsnNode newSwInsn = Objects.requireNonNull(swInsn).copyWithoutResult();
newSwInsn.replaceArg(swInsn.getArg(0), data.getStrArg().duplicate());
BlockUtils.replaceInsn(mth, newHeader, swInsn, newSwInsn);
keptInsns.add(newSwInsn);
SwitchRegion replaceRegion = new SwitchRegion(part1Parent, newHeader);
for (SwitchRegion.CaseInfo caseInfo : data.getNewCases()) {
IContainer container = caseInfo.getContainer();
RegionUtils.visitBlocks(mth, container, b -> keptInsns.addAll(b.getInstructions()));
replaceRegion.addCase(Collections.unmodifiableList(caseInfo.getKeys()), container);
replaceRegion.updateParent(container, replaceRegion);
}
if (!part1Parent.replaceSubBlock(part1Region, replaceRegion)) {
return false;
}
// remove original code
try {
List<InsnNode> removeInsns = RegionUtils.collectInsns(mth, part1Region);
if (part2Region != null) {
removeInsns.addAll(RegionUtils.collectInsns(mth, part2Region));
part2Region.getParent().getSubBlocks().remove(part2Region);
}
removeInsns.removeAll(keptInsns);
removeInsns.forEach(i -> i.add(AFlag.REMOVE));
// may be assigned before 1st region
RegisterArg numArg = data.getNumArg();
if (numArg != null) {
for (SSAVar ssaVar : numArg.getSVar().getCodeVar().getSsaVars()) {
InsnNode assignInsn = ssaVar.getAssignInsn();
@@ -158,141 +352,28 @@ public class SwitchOverStringVisitor extends AbstractVisitor implements IRegionI
}
}
InsnRemover.removeAllMarked(mth);
InsnRemover.remove(mth, data.getHashcodeInvokeInsn());
} catch (StackOverflowError | Exception e) {
mth.addWarnComment("Failed to clean up code after switch over string restore", e);
}
}
private boolean mergeWithCode(SwitchData switchData) {
// check for second switch
IContainer nextContainer = RegionUtils.getNextContainer(switchData.getMth(), switchData.getSwitchRegion());
if (!(nextContainer instanceof SwitchRegion)) {
return false;
}
SwitchRegion codeSwitch = (SwitchRegion) nextContainer;
InsnNode swInsn = BlockUtils.getLastInsnWithType(codeSwitch.getHeader(), InsnType.SWITCH);
if (swInsn == null || !swInsn.getArg(0).isRegister()) {
return false;
}
RegisterArg numArg = (RegisterArg) swInsn.getArg(0);
List<CaseData> cases = switchData.getCases();
// search index assign in cases code
int extracted = 0;
for (CaseData caseData : cases) {
InsnNode numInsn = searchConstInsn(switchData, caseData, swInsn);
Integer num = extractConstNumber(switchData, numInsn, numArg);
if (num != null) {
caseData.setCodeNum(num);
extracted++;
}
}
if (extracted == 0) {
// nothing to merge, code already inside first switch cases
return true;
}
if (extracted != cases.size()) {
return false;
}
// TODO: additional checks for found index numbers
cases.sort(Comparator.comparingInt(CaseData::getCodeNum));
// extract complete
Map<Integer, CaseData> casesMap = new HashMap<>(cases.size());
for (CaseData caseData : cases) {
CaseData prev = casesMap.put(caseData.getCodeNum(), caseData);
if (prev != null) {
return false;
}
RegionUtils.visitBlocks(switchData.getMth(), caseData.getCode(),
block -> switchData.getToRemove().add(block));
}
List<SwitchRegion.CaseInfo> newCases = new ArrayList<>();
for (SwitchRegion.CaseInfo caseInfo : codeSwitch.getCases()) {
SwitchRegion.CaseInfo newCase = null;
for (Object key : caseInfo.getKeys()) {
Integer intKey = unwrapIntKey(key);
if (intKey != null) {
CaseData caseData = casesMap.remove(intKey);
if (caseData == null) {
return false;
}
if (newCase == null) {
List<Object> keys = new ArrayList<>(caseData.getStrValues());
newCase = new SwitchRegion.CaseInfo(keys, caseInfo.getContainer());
} else {
// merge cases
newCase.getKeys().addAll(caseData.getStrValues());
}
} else if (key == SwitchRegion.DEFAULT_CASE_KEY) {
var iterator = casesMap.entrySet().iterator();
while (iterator.hasNext()) {
CaseData caseData = iterator.next().getValue();
if (newCase == null) {
List<Object> keys = new ArrayList<>(caseData.getStrValues());
newCase = new SwitchRegion.CaseInfo(keys, caseInfo.getContainer());
} else {
// merge cases
newCase.getKeys().addAll(caseData.getStrValues());
}
iterator.remove();
}
if (newCase == null) {
newCase = new SwitchRegion.CaseInfo(new ArrayList<>(), caseInfo.getContainer());
}
newCase.getKeys().add(SwitchRegion.DEFAULT_CASE_KEY);
} else {
return false;
}
}
newCases.add(newCase);
}
switchData.setCodeSwitch(codeSwitch);
switchData.setNumArg(numArg);
switchData.setNewCases(newCases);
return true;
}
private @Nullable Integer extractConstNumber(SwitchData switchData, @Nullable InsnNode numInsn, RegisterArg numArg) {
private static @Nullable Integer extractConstNumber(SwitchData switchData, @Nullable InsnNode numInsn) {
if (numInsn == null || numInsn.getArgsCount() != 1) {
return null;
}
Object constVal = InsnUtils.getConstValueByArg(switchData.getMth().root(), numInsn.getArg(0));
if (constVal instanceof LiteralArg) {
if (numArg.sameCodeVar(numInsn.getResult())) {
RegisterArg numArg = switchData.getNumArg();
if (numArg != null && numArg.sameCodeVar(numInsn.getResult())) {
return (int) ((LiteralArg) constVal).getLiteral();
}
}
return null;
}
private static @Nullable InsnNode searchConstInsn(SwitchData switchData, CaseData caseData, InsnNode swInsn) {
IContainer container = caseData.getCode();
if (container != null) {
List<InsnNode> insns = RegionUtils.collectInsns(switchData.getMth(), container);
insns.removeIf(i -> i.getType() == InsnType.BREAK);
if (insns.size() == 1) {
return insns.get(0);
}
} else if (caseData.getBlockRef() != null) {
// variable used unchanged on path from block ref
BlockNode blockRef = caseData.getBlockRef();
InsnArg swArg = swInsn.getArg(0);
if (swArg.isRegister()) {
InsnNode assignInsn = ((RegisterArg) swArg).getSVar().getAssignInsn();
if (assignInsn != null && assignInsn.getType() == InsnType.PHI) {
RegisterArg arg = ((PhiInsn) assignInsn).getArgByBlock(blockRef);
if (arg != null) {
return arg.getAssignInsn();
}
}
}
}
return null;
}
private Integer unwrapIntKey(Object key) {
private static Integer unwrapIntKey(Object key) {
if (key instanceof Integer) {
return (Integer) key;
}
@@ -306,130 +387,68 @@ public class SwitchOverStringVisitor extends AbstractVisitor implements IRegionI
return null;
}
private static Map<InsnNode, String> collectEqualsInsns(MethodNode mth, SSAVar strVar) {
Map<InsnNode, String> map = new IdentityHashMap<>(strVar.getUseCount() - 1);
for (RegisterArg useReg : strVar.getUseList()) {
InsnNode parentInsn = useReg.getParentInsn();
if (parentInsn != null && parentInsn.getType() == InsnType.INVOKE) {
InvokeNode inv = (InvokeNode) parentInsn;
if (inv.getCallMth().getRawFullId().equals("java.lang.String.equals(Ljava/lang/Object;)Z")) {
InsnArg strArg = inv.getArg(1);
Object strValue = InsnUtils.getConstValueByArg(mth.root(), strArg);
if (strValue instanceof String) {
map.put(parentInsn, (String) strValue);
}
}
}
}
return map;
}
private boolean processCase(SwitchData switchData, SwitchRegion.CaseInfo caseInfo) {
if (caseInfo.isDefaultCase()) {
CaseData caseData = new CaseData();
caseData.setCode(caseInfo.getContainer());
return true;
}
AtomicBoolean fail = new AtomicBoolean(false);
RegionUtils.visitRegions(switchData.getMth(), caseInfo.getContainer(), region -> {
if (fail.get()) {
return false;
}
if (region instanceof IfRegion) {
CaseData caseData = fillCaseData((IfRegion) region, switchData);
if (caseData == null) {
fail.set(true);
return false;
}
switchData.getCases().add(caseData);
}
return true;
});
return !fail.get();
}
private @Nullable CaseData fillCaseData(IfRegion ifRegion, SwitchData switchData) {
IfCondition condition = Objects.requireNonNull(ifRegion.getCondition());
boolean neg = false;
if (condition.getMode() == IfCondition.Mode.NOT) {
condition = condition.getArgs().get(0);
neg = true;
}
Compare compare = condition.getCompare();
if (compare == null) {
return null;
}
IfNode ifInsn = compare.getInsn();
InsnArg firstArg = ifInsn.getArg(0);
String str = null;
if (firstArg.isInsnWrap()) {
str = switchData.getStrEqInsns().get(((InsnWrapArg) firstArg).getWrapInsn());
}
if (str == null) {
return null;
}
if (ifInsn.getOp() == IfOp.NE && ifInsn.getArg(1).isTrue()) {
neg = true;
}
if (ifInsn.getOp() == IfOp.EQ && ifInsn.getArg(1).isFalse()) {
neg = true;
}
switchData.getToRemove().add(ifInsn);
switchData.getToRemove().addAll(ifRegion.getConditionBlocks());
CaseData caseData = new CaseData();
caseData.getStrValues().add(str);
IContainer codeContainer = neg ? ifRegion.getElseRegion() : ifRegion.getThenRegion();
if (codeContainer == null) {
// no code
// use last condition block for later data tracing
caseData.setBlockRef(Utils.last(ifRegion.getConditionBlocks()));
} else {
caseData.setCode(codeContainer);
}
return caseData;
}
private @Nullable RegisterArg getStrHashCodeArg(InsnArg arg) {
private static @Nullable InvokeNode getStrHashcodeInvokeInsn(InsnArg arg) {
InsnNode insn = null;
if (arg.isRegister()) {
return getStrFromInsn(((RegisterArg) arg).getAssignInsn());
insn = ((RegisterArg) arg).getAssignInsn();
} else if (arg.isInsnWrap()) {
insn = ((InsnWrapArg) arg).getWrapInsn();
}
if (arg.isInsnWrap()) {
return getStrFromInsn(((InsnWrapArg) arg).getWrapInsn());
if (insn != null && insn.getType() == InsnType.INVOKE) {
InvokeNode invInsn = (InvokeNode) insn;
if (invInsn.getCallMth().getRawFullId().equals("java.lang.String.hashCode()I")) {
return invInsn;
}
}
return null;
}
private @Nullable RegisterArg getStrFromInsn(@Nullable InsnNode insn) {
if (insn == null || insn.getType() != InsnType.INVOKE) {
return null;
private static boolean isIfStringEqualsInsn(InsnNode ifInsn) {
if (ifInsn != null && ifInsn.getType() == InsnType.IF && ifInsn.getArgsCount() == 2) {
InsnNode wrapped = InsnUtils.getWrappedInsn(ifInsn.getArg(0));
return wrapped != null && wrapped.getType() == InsnType.INVOKE
&& ((InvokeNode) wrapped).getCallMth().getRawFullId().equals("java.lang.String.equals(Ljava/lang/Object;)Z");
}
InvokeNode invInsn = (InvokeNode) insn;
MethodInfo callMth = invInsn.getCallMth();
if (!callMth.getRawFullId().equals("java.lang.String.hashCode()I")) {
return null;
return false;
}
private static @Nullable BlockNode getOnlyOneInsnBlock(BlockNode b) {
while (b != null) {
int size = b.getInstructions().size();
if (size == 0) {
b = BlockUtils.getNextBlock(b);
continue;
}
return size == 1 ? b : null;
}
InsnArg arg = invInsn.getInstanceArg();
if (arg == null || !arg.isRegister()) {
return null;
}
return (RegisterArg) arg;
return null;
}
private static final class SwitchData {
private final MethodNode mth;
private final SwitchRegion switchRegion;
private final List<IAttributeNode> toRemove = new ArrayList<>();
private Map<InsnNode, String> strEqInsns;
private SwitchStringType type = SwitchStringType.SWITCH_SWITCH;
// first switch/if region
private final IRegion part1Region;
// second switch region, null if type is SINGLE_SWITCH
private @Nullable SwitchRegion part2Region;
// each case is a str in part1Region, with its num or code block
private List<CaseData> cases;
private List<SwitchRegion.CaseInfo> newCases;
private SwitchRegion codeSwitch;
private RegisterArg numArg;
private RegisterArg strArg;
private InsnNode hashcodeInvokeInsn;
private SwitchData(MethodNode mth, SwitchRegion switchRegion) {
private SwitchData(MethodNode mth, IRegion part1Region) {
this.mth = mth;
this.switchRegion = switchRegion;
this.part1Region = part1Region;
}
public SwitchStringType getType() {
return type;
}
public void setType(SwitchStringType type) {
this.type = type;
}
public List<CaseData> getCases() {
@@ -452,76 +471,75 @@ public class SwitchOverStringVisitor extends AbstractVisitor implements IRegionI
return mth;
}
public Map<InsnNode, String> getStrEqInsns() {
return strEqInsns;
public IRegion getPart1Region() {
return part1Region;
}
public void setStrEqInsns(Map<InsnNode, String> strEqInsns) {
this.strEqInsns = strEqInsns;
public @Nullable SwitchRegion getPart2Region() {
return part2Region;
}
public SwitchRegion getSwitchRegion() {
return switchRegion;
public void setPart2Region(@Nullable SwitchRegion part2Region) {
this.part2Region = part2Region;
}
public List<IAttributeNode> getToRemove() {
return toRemove;
}
public SwitchRegion getCodeSwitch() {
return codeSwitch;
}
public void setCodeSwitch(SwitchRegion codeSwitch) {
this.codeSwitch = codeSwitch;
}
public RegisterArg getNumArg() {
public @Nullable RegisterArg getNumArg() {
return numArg;
}
public void setNumArg(RegisterArg numArg) {
this.numArg = numArg;
}
public RegisterArg getStrArg() {
return strArg;
}
public void setStrArg(RegisterArg strArg) {
this.strArg = strArg;
}
public InsnNode getHashcodeInvokeInsn() {
return hashcodeInvokeInsn;
}
public void setHashcodeInvokeInsn(InsnNode hashcodeInvokeInsn) {
this.hashcodeInvokeInsn = hashcodeInvokeInsn;
}
}
private static final class CaseData {
private final List<String> strValues = new ArrayList<>();
private @Nullable IContainer code = null;
private @Nullable BlockNode blockRef = null;
private int codeNum = -1;
private final Object strValue;
private final BlockNode code;
private final Integer codeNum;
public List<String> getStrValues() {
return strValues;
private CaseData(Object strValue, Integer codeNum, BlockNode code) {
this.strValue = strValue;
this.code = code;
this.codeNum = codeNum;
}
public @Nullable IContainer getCode() {
public Object getStrValue() {
return strValue;
}
public @Nullable BlockNode getCode() {
return code;
}
public void setCode(@Nullable IContainer code) {
this.code = code;
}
public @Nullable BlockNode getBlockRef() {
return blockRef;
}
public void setBlockRef(@Nullable BlockNode blockRef) {
this.blockRef = blockRef;
}
public int getCodeNum() {
public Integer getCodeNum() {
return codeNum;
}
public void setCodeNum(int codeNum) {
this.codeNum = codeNum;
}
@Override
public String toString() {
return "CaseData{" + strValues + '}';
return "CaseData{" + strValue + '}';
}
}
private enum SwitchStringType {
SINGLE_SWITCH,
IF_SWITCH,
SWITCH_SWITCH
}
}
jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchOverStrings4.java
+20
View File
@@ -0,0 +1,20 @@
package jadx.tests.integration.switches;
import org.junit.jupiter.api.Test;
import jadx.tests.api.SmaliTest;
import static jadx.tests.api.utils.assertj.JadxAssertions.assertThat;
// issue #2770
public class TestSwitchOverStrings4 extends SmaliTest {
@Test
public void testSmali() {
disableCompilation();
allowWarnInCode();
assertThat(getClassNodeFromSmali())
.code()
.containsOne("case \"DESKTOP\"")
.countString(4, "case");
}
}
jadx-core/src/test/java/jadx/tests/integration/switches/TestSwitchOverStrings5.java
+21
View File
@@ -0,0 +1,21 @@
package jadx.tests.integration.switches;
import org.junit.jupiter.api.Test;
import jadx.tests.api.SmaliTest;
import static jadx.tests.api.utils.assertj.JadxAssertions.assertThat;
// issue #2359
public class TestSwitchOverStrings5 extends SmaliTest {
@Test
public void testSmali() {
disableCompilation();
allowWarnInCode();
assertThat(getClassNodeFromSmali())
.code()
.containsOne("case \"mp3_400_e5\"")
.countString(9, "case ")
.countString(1, "default:");
}
}
jadx-core/src/test/smali/switches/TestSwitchOverStrings3.smali
-99
View File
@@ -1,99 +0,0 @@
.class public LTestSwitchOverStrings3;
.super Ljava/lang/Object;
.method public test3(Ljava/lang/String;)I
.registers 5
.line 87
invoke-virtual {p1}, Ljava/lang/String;->hashCode()I
move-result v0
const/4 v1, 0x0
const/4 v2, 0x1
packed-switch v0, :pswitch_data_38
:cond_9
goto :goto_32
:pswitch_a
const-string v0, "branch4"
invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p1
if-eqz p1, :cond_9
const/4 p1, 0x3
goto :goto_33
:pswitch_14
const-string v0, "branch3"
invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p1
if-eqz p1, :cond_9
const/4 p1, 0x2
goto :goto_33
:pswitch_1e
const-string v0, "branch2"
invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p1
if-eqz p1, :cond_9
const/4 p1, 0x1
goto :goto_33
:pswitch_28
const-string v0, "branch1"
invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p1
if-eqz p1, :cond_9
const/4 p1, 0x0
goto :goto_33
:goto_32
const/4 p1, -0x1
:goto_33
packed-switch p1, :pswitch_data_44
.line 94
return v1
.line 90
:pswitch_37
return v2
:pswitch_data_38
.packed-switch 0x8358ecf
:pswitch_28
:pswitch_1e
:pswitch_14
:pswitch_a
.end packed-switch
:pswitch_data_44
.packed-switch 0x0
:pswitch_37
:pswitch_37
.end packed-switch
.end method
jadx-core/src/test/smali/switches/TestSwitchOverStrings4.smali
+163 -51
View File
@@ -1,89 +1,201 @@
.class public LTestSwitchOverStrings4;
.super Ljava/lang/Object;
.class public Lswitches/TestSwitchOverStrings4;
.super Landroid/support/v7/app/AppCompatActivity;
.method public static test4(Ljava/lang/String;)I
.registers 10
.method private test()V
.registers 7
const/16 v3, 0x0
.line 220
invoke-virtual {p0}, Lswitches/TestSwitchOverStrings4;->getSupportFragmentManager()Landroid/support/v4/app/FragmentManager;
const/16 v4, -0x1
move-result-object v0
if-nez p0, :cond_26
const v1, 0x7f090070
return v4
invoke-virtual {v0, v1}, Landroid/support/v4/app/FragmentManager;->findFragmentById(I)Landroid/support/v4/app/Fragment;
:cond_26
.line 202
move-result-object v0
invoke-virtual {p0}, Ljava/lang/String;->hashCode()I
.line 221
invoke-virtual {v0}, Landroid/support/v4/app/Fragment;->getTag()Ljava/lang/String;
move-result-object v0
const/4 v1, 0x0
if-nez v0, :cond_16
.line 225
invoke-direct {p0, v1}, Lswitches/TestSwitchOverStrings4;->setHomeIsActionBack(Z)V
return-void
:cond_16
const-string v2, "CONTAINER_PROP"
.line 230
invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result v2
sparse-switch v2, :sswitch_data_222
const/4 v3, 0x1
const/4 v0, -0x1
if-nez v2, :cond_2c
const/16 v2, 0x13
const-string v2, "CHOOSE_FILE"
goto/16 :goto_20a
.line 231
invoke-virtual {v0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
:sswitch_3b
const/16 v2, 0x13
move-result v2
const-string/jumbo v1, "video/x-matroska"
if-eqz v2, :cond_28
invoke-virtual {p0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
goto :goto_2c
.line 236
:cond_28
invoke-direct {p0, v1}, Lswitches/TestSwitchOverStrings4;->setHomeIsActionBack(Z)V
goto :goto_2f
.line 233
:cond_2c
:goto_2c
invoke-direct {p0, v3}, Lswitches/TestSwitchOverStrings4;->setHomeIsActionBack(Z)V
:goto_2f
const/4 v2, -0x1
.line 240
invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
move-result v4
const v5, -0x7864e404
if-eq v4, v5, :cond_67
const v1, -0x3f1aacc4
if-eq v4, v1, :cond_5d
const v1, -0x1d0b6cd4
if-eq v4, v1, :cond_53
const v1, 0x2ad8bc
if-eq v4, v1, :cond_49
goto :goto_70
:cond_49
const-string v1, "INSTALL_NEW"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result v0
if-nez v0, :cond_48
if-eqz v0, :cond_70
goto/16 :goto_207
const/4 v1, 0x2
:cond_48
const/16 v0, 0x1
goto :goto_71
goto/16 :goto_20a
:cond_53
const-string v1, "MANAGE_CONTAINERS"
:sswitch_1fd
const/16 v2, 0x13
const-string v1, "audio/eac3-joc"
invoke-virtual {p0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result v0
if-nez v0, :cond_209
if-eqz v0, :cond_70
:goto_207
const/4 v0, -0x1
const/4 v1, 0x3
goto :goto_20a
goto :goto_71
:cond_209
const/4 v0, 0x0
:cond_5d
const-string v1, "START_MENU"
:goto_20a
packed-switch v0, :pswitch_data_29c
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
return v4
move-result v0
:pswitch_216
return v2
if-eqz v0, :cond_70
:pswitch_221
return v3
move v1, v3
:sswitch_data_222
.sparse-switch
0xb269699 -> :sswitch_1fd
0x79909c15 -> :sswitch_3b
.end sparse-switch
goto :goto_71
:pswitch_data_29c
:cond_67
const-string v3, "DESKTOP"
invoke-virtual {v0, v3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result v0
if-eqz v0, :cond_70
goto :goto_71
:cond_70
:goto_70
move v1, v2
:goto_71
packed-switch v1, :pswitch_data_9a
goto :goto_98
.line 252
:pswitch_75
iget-object v0, p0, Lswitches/TestSwitchOverStrings4;->mNavigationView:Landroid/support/design/widget/NavigationView;
const v1, 0x7f090074
invoke-virtual {v0, v1}, Landroid/support/design/widget/NavigationView;->setCheckedItem(I)V
goto :goto_98
.line 249
:pswitch_7e
iget-object v0, p0, Lswitches/TestSwitchOverStrings4;->mNavigationView:Landroid/support/design/widget/NavigationView;
const v1, 0x7f090073
invoke-virtual {v0, v1}, Landroid/support/design/widget/NavigationView;->setCheckedItem(I)V
goto :goto_98
.line 246
:pswitch_87
iget-object v0, p0, Lswitches/TestSwitchOverStrings4;->mNavigationView:Landroid/support/design/widget/NavigationView;
const v1, 0x7f090075
invoke-virtual {v0, v1}, Landroid/support/design/widget/NavigationView;->setCheckedItem(I)V
goto :goto_98
.line 243
:pswitch_90
iget-object v0, p0, Lswitches/TestSwitchOverStrings4;->mNavigationView:Landroid/support/design/widget/NavigationView;
const v1, 0x7f090071
invoke-virtual {v0, v1}, Landroid/support/design/widget/NavigationView;->setCheckedItem(I)V
:goto_98
return-void
nop
:pswitch_data_9a
.packed-switch 0x0
:pswitch_221
:pswitch_216
:pswitch_90
:pswitch_87
:pswitch_7e
:pswitch_75
.end packed-switch
.end method
jadx-core/src/test/smali/switches/TestSwitchOverStrings5.smali
+146
View File
@@ -0,0 +1,146 @@
.class public Lswitches/TestSwitchOverStrings5;
.super Ljava/lang/Object;
.method public enableClockSync()Z
.registers 2
.line 175
iget-object p0, p0, Lswitches/TestSwitchOverStrings5;->modelId:Ljava/lang/String;
invoke-virtual {p0}, Ljava/lang/String;->hashCode()I
move-result v0
sparse-switch v0, :sswitch_data_60
goto :goto_5d
:sswitch_a
const-string v0, "mp3_310"
invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p0
if-nez p0, :cond_5b
goto :goto_5d
:sswitch_13
const-string v0, "liberty_e5plus_150"
invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p0
if-nez p0, :cond_5b
goto :goto_5d
:sswitch_1c
const-string v0, "liberty_e5plus_125"
invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p0
if-eqz p0, :cond_5d
goto :goto_5b
:sswitch_25
const-string v0, "p197"
invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p0
if-nez p0, :cond_5b
goto :goto_5d
:sswitch_2e
const-string v0, "beverly_my_2020_350"
invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p0
if-nez p0, :cond_5b
goto :goto_5d
:sswitch_37
const-string v0, "liberty_e5plus_50"
invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p0
if-nez p0, :cond_5b
goto :goto_5d
:sswitch_40
const-string v0, "mp3_300_hpe_e5"
invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p0
if-nez p0, :cond_5b
goto :goto_5d
:sswitch_49
const-string v0, "mp3_500_e5"
invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p0
if-nez p0, :cond_5b
goto :goto_5d
:sswitch_52
const-string v0, "mp3_400_e5"
invoke-virtual {p0, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p0
if-nez p0, :cond_5b
goto :goto_5d
:cond_5b
:goto_5b
const/4 p0, 0x0
goto :goto_5e
:cond_5d
:goto_5d
const/4 p0, 0x1
:goto_5e
return p0
nop
:sswitch_data_60
.sparse-switch
-0x7006ac76 -> :sswitch_52
-0x6e51d3d7 -> :sswitch_49
-0x670ba373 -> :sswitch_40
-0x5287fd58 -> :sswitch_37
-0x377a5db4 -> :sswitch_2e
0x33a89f -> :sswitch_25
0x18843c7 -> :sswitch_1c
0x188441f -> :sswitch_13
0x4820a3c3 -> :sswitch_a
.end sparse-switch
.end method