Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed unused method #51

Merged
merged 2 commits into from
Dec 6, 2022
Merged

Removed unused method #51

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2b4873
Removed unused method
nbauma109 Dec 6, 2022
321f194
Removed replace loop switch break
nbauma109 Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 1 addition & 101 deletions .../org/jd/core/v1/service/converter/classfiletojavasyntax/util/ControlFlowGraphReducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,15 +712,7 @@ private boolean reduceSwitchDeclaration(BitSet visited, BasicBlock basicBlock, B
}

if (end == END) {
if (lastSC != null && lastSC.getBasicBlock() == lastSwitchCaseBasicBlock && searchLoopStart(basicBlock, maxOffset)) {
replaceLoopStartWithSwitchBreak(new BitSet(), basicBlock);
end = LOOP_START;
if (defaultSC != null) {
defaultSC.setBasicBlock(end);
}
} else {
end = lastSwitchCaseBasicBlock;
}
end = lastSwitchCaseBasicBlock;
} else {
visit(v, lastSwitchCaseBasicBlock, end.getFromOffset(), ends);
}
Expand Down Expand Up @@ -793,55 +785,6 @@ private boolean reduceSwitchDeclaration(BitSet visited, BasicBlock basicBlock, B
return reduced;
}

private static boolean searchLoopStart(BasicBlock basicBlock, int maxOffset) {
WatchDog watchdog = new WatchDog();

BasicBlock bb;
for (SwitchCase switchCase : basicBlock.getSwitchCases()) {
bb = switchCase.getBasicBlock();
if (bb != null) {
watchdog.clear();

BasicBlock next;
while (bb != null && bb.getFromOffset() < maxOffset) {
if (bb == LOOP_START) {
return true;
}

if (bb.matchType(GROUP_END|GROUP_CONDITION)) {
break;
}

next = null;

if (bb.matchType(GROUP_SINGLE_SUCCESSOR)) {
next = bb.getNext();
} else if (bb.getType() == TYPE_CONDITIONAL_BRANCH) {
next = bb.getBranch();
} else if (bb.getType() == TYPE_SWITCH_DECLARATION) {
int max = bb.getFromOffset();

for (SwitchCase sc : bb.getSwitchCases()) {
if (max < sc.getBasicBlock().getFromOffset()) {
next = sc.getBasicBlock();
max = next.getFromOffset();
}
}
}

if (bb == next) {
break;
}

watchdog.check(bb, next);
bb = next;
}
}
}

return false;
}

protected boolean reduceTryDeclaration(BitSet visited, BasicBlock basicBlock, BitSet jsrTargets) {
boolean reduced = true;
BasicBlock finallyBB = null;
Expand Down Expand Up @@ -1411,49 +1354,6 @@ private static void visit(BitSet visited, BasicBlock basicBlock, int maxOffset,
}
}

private static void replaceLoopStartWithSwitchBreak(BitSet visited, BasicBlock basicBlock) {
if (!basicBlock.matchType(GROUP_END) && !visited.get(basicBlock.getIndex())) {
visited.set(basicBlock.getIndex());
basicBlock.replace(LOOP_START, SWITCH_BREAK);

switch (basicBlock.getType()) {
case TYPE_CONDITIONAL_BRANCH, TYPE_JSR, TYPE_CONDITION:
replaceLoopStartWithSwitchBreak(visited, basicBlock.getBranch());
// intended fall through
case TYPE_START, TYPE_STATEMENTS, TYPE_GOTO, TYPE_GOTO_IN_TERNARY_OPERATOR, TYPE_LOOP:
replaceLoopStartWithSwitchBreak(visited, basicBlock.getNext());
break;
case TYPE_TRY, TYPE_TRY_JSR, TYPE_TRY_ECLIPSE:
replaceLoopStartWithSwitchBreak(visited, basicBlock.getSub1());
// intended fall through
case TYPE_TRY_DECLARATION:
for (ExceptionHandler exceptionHandler : basicBlock.getExceptionHandlers()) {
replaceLoopStartWithSwitchBreak(visited, exceptionHandler.getBasicBlock());
}
break;
case TYPE_IF_ELSE, TYPE_TERNARY_OPERATOR:
replaceLoopStartWithSwitchBreak(visited, basicBlock.getSub2());
// intended fall through
case TYPE_IF:
replaceLoopStartWithSwitchBreak(visited, basicBlock.getSub1());
replaceLoopStartWithSwitchBreak(visited, basicBlock.getNext());
break;
case TYPE_CONDITION_OR, TYPE_CONDITION_AND:
replaceLoopStartWithSwitchBreak(visited, basicBlock.getSub1());
replaceLoopStartWithSwitchBreak(visited, basicBlock.getSub2());
break;
case TYPE_SWITCH:
replaceLoopStartWithSwitchBreak(visited, basicBlock.getNext());
// intended fall through
case TYPE_SWITCH_DECLARATION:
for (SwitchCase switchCase : basicBlock.getSwitchCases()) {
replaceLoopStartWithSwitchBreak(visited, switchCase.getBasicBlock());
}
break;
}
}
}

private BasicBlock searchUpdateBlockAndCreateContinueLoop(BitSet visited, BasicBlock basicBlock) {
BasicBlock updateBasicBlock = null;

Expand Down