-
-
Notifications
You must be signed in to change notification settings - Fork 83
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor buildtraps method, removed javapoet testcase
- Loading branch information
1 parent
9024d31
commit 51d049b
Showing
10 changed files
with
326 additions
and
458 deletions.
There are no files selected for viewing
337 changes: 165 additions & 172 deletions
337
sootup.core/src/main/java/sootup/core/graph/BlockGraphIterator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,194 +1,187 @@ | ||
| package sootup.core.graph; | ||
|
|
||
| import java.util.*; | ||
| import java.util.stream.Collectors; | ||
| import javax.annotation.Nonnull; | ||
| import javax.annotation.Nullable; | ||
| import sootup.core.jimple.common.stmt.JGotoStmt; | ||
| import sootup.core.jimple.common.stmt.Stmt; | ||
| import sootup.core.types.ClassType; | ||
| import sootup.core.util.DotExporter; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
| import javax.annotation.Nullable; | ||
| import java.util.*; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
| * Iterates over the blocks | ||
| */ | ||
| /** Iterates over the blocks */ | ||
| public class BlockGraphIterator implements Iterator<BasicBlock<?>> { | ||
|
|
||
| private final StmtGraph stmtGraph; | ||
| @Nonnull | ||
| private final ArrayDeque<BasicBlock<?>> trapHandlerBlocks = new ArrayDeque<>(); | ||
|
|
||
| @Nonnull | ||
| private final ArrayDeque<BasicBlock<?>> nestedBlocks = new ArrayDeque<>(); | ||
| @Nonnull | ||
| private final ArrayDeque<BasicBlock<?>> otherBlocks = new ArrayDeque<>(); | ||
| @Nonnull | ||
| private final Set<BasicBlock<?>> iteratedBlocks; | ||
|
|
||
| public BlockGraphIterator(StmtGraph stmtGraph) { | ||
| this.stmtGraph = stmtGraph; | ||
| final Collection<? extends BasicBlock<?>> blocks = stmtGraph.getBlocks(); | ||
| iteratedBlocks = new LinkedHashSet<>(blocks.size(), 1); | ||
| Stmt startingStmt = stmtGraph.getStartingStmt(); | ||
| if (startingStmt != null) { | ||
| final BasicBlock<?> startingBlock = stmtGraph.getStartingStmtBlock(); | ||
| updateFollowingBlocks(startingBlock); | ||
| nestedBlocks.addFirst(startingBlock); | ||
| } | ||
| private final StmtGraph stmtGraph; | ||
| @Nonnull private final ArrayDeque<BasicBlock<?>> trapHandlerBlocks = new ArrayDeque<>(); | ||
|
|
||
| @Nonnull private final ArrayDeque<BasicBlock<?>> nestedBlocks = new ArrayDeque<>(); | ||
| @Nonnull private final ArrayDeque<BasicBlock<?>> otherBlocks = new ArrayDeque<>(); | ||
| @Nonnull private final Set<BasicBlock<?>> iteratedBlocks; | ||
|
|
||
| public BlockGraphIterator(StmtGraph stmtGraph) { | ||
| this.stmtGraph = stmtGraph; | ||
| final Collection<? extends BasicBlock<?>> blocks = stmtGraph.getBlocks(); | ||
| iteratedBlocks = new LinkedHashSet<>(blocks.size(), 1); | ||
| Stmt startingStmt = stmtGraph.getStartingStmt(); | ||
| if (startingStmt != null) { | ||
| final BasicBlock<?> startingBlock = stmtGraph.getStartingStmtBlock(); | ||
| updateFollowingBlocks(startingBlock); | ||
| nestedBlocks.addFirst(startingBlock); | ||
| } | ||
|
|
||
| @Nullable | ||
| private BasicBlock<?> retrieveNextBlock() { | ||
| BasicBlock<?> nextBlock; | ||
| do { | ||
| if (!nestedBlocks.isEmpty()) { | ||
| nextBlock = nestedBlocks.pollFirst(); | ||
| } else if (!trapHandlerBlocks.isEmpty()) { | ||
| nextBlock = trapHandlerBlocks.pollFirst(); | ||
| } else if (!otherBlocks.isEmpty()) { | ||
| nextBlock = otherBlocks.pollFirst(); | ||
| } else { | ||
| Collection<? extends BasicBlock<?>> blocks = stmtGraph.getBlocks(); | ||
| if (iteratedBlocks.size() < blocks.size()) { | ||
| // graph is not connected! iterate/append all not connected blocks at the end in no | ||
| // particular order. | ||
| for (BasicBlock<?> block : blocks) { | ||
| if (!iteratedBlocks.contains(block)) { | ||
| nestedBlocks.addLast(block); | ||
| } | ||
| } | ||
| if (!nestedBlocks.isEmpty()) { | ||
| return nestedBlocks.pollFirst(); | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| @Nullable | ||
| private BasicBlock<?> retrieveNextBlock() { | ||
| BasicBlock<?> nextBlock; | ||
| do { | ||
| if (!nestedBlocks.isEmpty()) { | ||
| nextBlock = nestedBlocks.pollFirst(); | ||
| } else if (!trapHandlerBlocks.isEmpty()) { | ||
| nextBlock = trapHandlerBlocks.pollFirst(); | ||
| } else if (!otherBlocks.isEmpty()) { | ||
| nextBlock = otherBlocks.pollFirst(); | ||
| } else { | ||
| Collection<? extends BasicBlock<?>> blocks = stmtGraph.getBlocks(); | ||
| if (iteratedBlocks.size() < blocks.size()) { | ||
| // graph is not connected! iterate/append all not connected blocks at the end in no | ||
| // particular order. | ||
| for (BasicBlock<?> block : blocks) { | ||
| if (!iteratedBlocks.contains(block)) { | ||
| nestedBlocks.addLast(block); | ||
| } | ||
| } | ||
| if (!nestedBlocks.isEmpty()) { | ||
| return nestedBlocks.pollFirst(); | ||
| } | ||
| } | ||
|
|
||
| // skip retrieved nextBlock if its already returned | ||
| } while (iteratedBlocks.contains(nextBlock)); | ||
| return nextBlock; | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| @Nonnull | ||
| public BasicBlock<?> next() { | ||
| BasicBlock<?> currentBlock = retrieveNextBlock(); | ||
| if (currentBlock == null) { | ||
| throw new NoSuchElementException("Iterator has no more Blocks."); | ||
| } | ||
| updateFollowingBlocks(currentBlock); | ||
| iteratedBlocks.add(currentBlock); | ||
| return currentBlock; | ||
| // skip retrieved nextBlock if its already returned | ||
| } while (iteratedBlocks.contains(nextBlock)); | ||
| return nextBlock; | ||
| } | ||
|
|
||
| @Override | ||
| @Nonnull | ||
| public BasicBlock<?> next() { | ||
| BasicBlock<?> currentBlock = retrieveNextBlock(); | ||
| if (currentBlock == null) { | ||
| throw new NoSuchElementException("Iterator has no more Blocks."); | ||
| } | ||
| updateFollowingBlocks(currentBlock); | ||
| iteratedBlocks.add(currentBlock); | ||
| return currentBlock; | ||
| } | ||
|
|
||
| private void updateFollowingBlocks(BasicBlock<?> currentBlock) { | ||
| // collect traps | ||
| final Stmt tailStmt = currentBlock.getTail(); | ||
| for (Map.Entry<? extends ClassType, ? extends BasicBlock<?>> entry : | ||
| currentBlock.getExceptionalSuccessors().entrySet()) { | ||
| BasicBlock<?> trapHandlerBlock = entry.getValue(); | ||
| trapHandlerBlocks.addLast(trapHandlerBlock); | ||
| nestedBlocks.addFirst(trapHandlerBlock); | ||
| } | ||
|
|
||
| private void updateFollowingBlocks(BasicBlock<?> currentBlock) { | ||
| // collect traps | ||
| final Stmt tailStmt = currentBlock.getTail(); | ||
| for (Map.Entry<? extends ClassType, ? extends BasicBlock<?>> entry : | ||
| currentBlock.getExceptionalSuccessors().entrySet()) { | ||
| BasicBlock<?> trapHandlerBlock = entry.getValue(); | ||
| trapHandlerBlocks.addLast(trapHandlerBlock); | ||
| nestedBlocks.addFirst(trapHandlerBlock); | ||
| final List<? extends BasicBlock<?>> successors = currentBlock.getSuccessors(); | ||
|
|
||
| for (int i = successors.size() - 1; i >= 0; i--) { | ||
| if (i == 0 && tailStmt.fallsThrough()) { | ||
| // non-branching successors i.e. not a BranchingStmt or is the first successor (i.e. its | ||
| // false successor) of | ||
| // JIfStmt | ||
| nestedBlocks.addFirst(successors.get(0)); | ||
| } else { | ||
|
|
||
| // create the longest FallsThroughStmt sequence possible | ||
| final BasicBlock<?> successorBlock = successors.get(i); | ||
| BasicBlock<?> leaderOfFallsthroughBlocks = successorBlock; | ||
| while (true) { | ||
| final List<? extends BasicBlock<?>> itPreds = | ||
| leaderOfFallsthroughBlocks.getPredecessors(); | ||
|
|
||
| BasicBlock<?> finalLeaderOfFallsthroughBlocks = leaderOfFallsthroughBlocks; | ||
| final Optional<? extends BasicBlock<?>> fallsthroughPredOpt = | ||
| itPreds.stream() | ||
| .filter( | ||
| b -> | ||
| b.getTail().fallsThrough() | ||
| && b.getSuccessors().get(0) == finalLeaderOfFallsthroughBlocks) | ||
| .findAny(); | ||
| if (!fallsthroughPredOpt.isPresent()) { | ||
| break; | ||
| } | ||
| BasicBlock<?> predecessorBlock = fallsthroughPredOpt.get(); | ||
| if (predecessorBlock.getTail().fallsThrough() | ||
| && predecessorBlock.getSuccessors().get(0) == leaderOfFallsthroughBlocks) { | ||
| leaderOfFallsthroughBlocks = predecessorBlock; | ||
| } else { | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| final List<? extends BasicBlock<?>> successors = currentBlock.getSuccessors(); | ||
|
|
||
| for (int i = successors.size() - 1; i >= 0; i--) { | ||
| if (i == 0 && tailStmt.fallsThrough()) { | ||
| // non-branching successors i.e. not a BranchingStmt or is the first successor (i.e. its | ||
| // false successor) of | ||
| // JIfStmt | ||
| nestedBlocks.addFirst(successors.get(0)); | ||
| } else { | ||
|
|
||
| // create the longest FallsThroughStmt sequence possible | ||
| final BasicBlock<?> successorBlock = successors.get(i); | ||
| BasicBlock<?> leaderOfFallsthroughBlocks = successorBlock; | ||
| while (true) { | ||
| final List<? extends BasicBlock<?>> itPreds = | ||
| leaderOfFallsthroughBlocks.getPredecessors(); | ||
|
|
||
| BasicBlock<?> finalLeaderOfFallsthroughBlocks = leaderOfFallsthroughBlocks; | ||
| final Optional<? extends BasicBlock<?>> fallsthroughPredOpt = | ||
| itPreds.stream() | ||
| .filter( | ||
| b -> | ||
| b.getTail().fallsThrough() | ||
| && b.getSuccessors().get(0) == finalLeaderOfFallsthroughBlocks) | ||
| .findAny(); | ||
| if (!fallsthroughPredOpt.isPresent()) { | ||
| break; | ||
| } | ||
| BasicBlock<?> predecessorBlock = fallsthroughPredOpt.get(); | ||
| if (predecessorBlock.getTail().fallsThrough() | ||
| && predecessorBlock.getSuccessors().get(0) == leaderOfFallsthroughBlocks) { | ||
| leaderOfFallsthroughBlocks = predecessorBlock; | ||
| } else { | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| // find a return Stmt inside the current Block | ||
| Stmt succTailStmt = successorBlock.getTail(); | ||
| boolean hasNoSuccessorStmts = succTailStmt.getExpectedSuccessorCount() == 0; | ||
| boolean isExceptionFree = successorBlock.getExceptionalSuccessors().isEmpty(); | ||
|
|
||
| boolean isLastStmtCandidate = hasNoSuccessorStmts && isExceptionFree; | ||
| // remember branching successors | ||
| if (tailStmt instanceof JGotoStmt) { | ||
| if (isLastStmtCandidate) { | ||
| nestedBlocks.removeFirstOccurrence(currentBlock); | ||
| otherBlocks.addLast(leaderOfFallsthroughBlocks); | ||
| } else { | ||
| otherBlocks.addFirst(leaderOfFallsthroughBlocks); | ||
| } | ||
| } else if (!nestedBlocks.contains(leaderOfFallsthroughBlocks)) { | ||
| // JSwitchStmt, JIfStmt | ||
| if (isLastStmtCandidate) { | ||
| nestedBlocks.addLast(leaderOfFallsthroughBlocks); | ||
| } else { | ||
| nestedBlocks.addFirst(leaderOfFallsthroughBlocks); | ||
| } | ||
| } | ||
| } | ||
| // find a return Stmt inside the current Block | ||
| Stmt succTailStmt = successorBlock.getTail(); | ||
| boolean hasNoSuccessorStmts = succTailStmt.getExpectedSuccessorCount() == 0; | ||
| boolean isExceptionFree = successorBlock.getExceptionalSuccessors().isEmpty(); | ||
|
|
||
| boolean isLastStmtCandidate = hasNoSuccessorStmts && isExceptionFree; | ||
| // remember branching successors | ||
| if (tailStmt instanceof JGotoStmt) { | ||
| if (isLastStmtCandidate) { | ||
| nestedBlocks.removeFirstOccurrence(currentBlock); | ||
| otherBlocks.addLast(leaderOfFallsthroughBlocks); | ||
| } else { | ||
| otherBlocks.addFirst(leaderOfFallsthroughBlocks); | ||
| } | ||
| } else if (!nestedBlocks.contains(leaderOfFallsthroughBlocks)) { | ||
| // JSwitchStmt, JIfStmt | ||
| if (isLastStmtCandidate) { | ||
| nestedBlocks.addLast(leaderOfFallsthroughBlocks); | ||
| } else { | ||
| nestedBlocks.addFirst(leaderOfFallsthroughBlocks); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasNext() { | ||
| final boolean hasIteratorMoreElements; | ||
| BasicBlock<?> b = retrieveNextBlock(); | ||
| if (b != null) { | ||
| // reinsert at FIRST position -> not great for performance - but easier handling in | ||
| // next() | ||
| nestedBlocks.addFirst(b); | ||
| hasIteratorMoreElements = true; | ||
| } else { | ||
| hasIteratorMoreElements = false; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasNext() { | ||
| final boolean hasIteratorMoreElements; | ||
| BasicBlock<?> b = retrieveNextBlock(); | ||
| if (b != null) { | ||
| // reinsert at FIRST position -> not great for performance - but easier handling in | ||
| // next() | ||
| nestedBlocks.addFirst(b); | ||
| hasIteratorMoreElements = true; | ||
| } else { | ||
| hasIteratorMoreElements = false; | ||
| } | ||
|
|
||
| // "assertion" that all elements are iterated | ||
| if (!hasIteratorMoreElements) { | ||
| final int returnedSize = iteratedBlocks.size(); | ||
| final Collection<? extends BasicBlock<?>> blocks = stmtGraph.getBlocks(); | ||
| final int actualSize = blocks.size(); | ||
| if (returnedSize != actualSize) { | ||
| String info = | ||
| blocks.stream() | ||
| .filter(n -> !iteratedBlocks.contains(n)) | ||
| .map(BasicBlock::getStmts) | ||
| .collect(Collectors.toList()) | ||
| .toString(); | ||
| throw new IllegalStateException( | ||
| "There are " | ||
| + (actualSize - returnedSize) | ||
| + " Blocks that are not iterated! i.e. the StmtGraph is not connected from its startingStmt!" | ||
| + info | ||
| + DotExporter.createUrlToWebeditor(stmtGraph)); | ||
| } | ||
| } | ||
| return hasIteratorMoreElements; | ||
| // "assertion" that all elements are iterated | ||
| if (!hasIteratorMoreElements) { | ||
| final int returnedSize = iteratedBlocks.size(); | ||
| final Collection<? extends BasicBlock<?>> blocks = stmtGraph.getBlocks(); | ||
| final int actualSize = blocks.size(); | ||
| if (returnedSize != actualSize) { | ||
| String info = | ||
| blocks.stream() | ||
| .filter(n -> !iteratedBlocks.contains(n)) | ||
| .map(BasicBlock::getStmts) | ||
| .collect(Collectors.toList()) | ||
| .toString(); | ||
| throw new IllegalStateException( | ||
| "There are " | ||
| + (actualSize - returnedSize) | ||
| + " Blocks that are not iterated! i.e. the StmtGraph is not connected from its startingStmt!" | ||
| + info | ||
| + DotExporter.createUrlToWebeditor(stmtGraph)); | ||
| } | ||
| } | ||
| return hasIteratorMoreElements; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.