azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-3141 Use iteration instead of recursion in traverseInstructionsInReverseOrder and traverseNextInstructions.

Browse Source
This commit is contained in:
Ioannis Tsakpinis
2012-12-07 00:27:32 +02:00
committed by Svetlana Isakova
parent d7a60f5fed
commit f5d6e8d751
1 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeImpl.java
+41 -12
View File
@@ -177,16 +177,29 @@ public class PseudocodeImpl implements Pseudocode {
return reversedInstructions;
}
private static void traverseInstructionsInReverseOrder(@NotNull Instruction instruction,
private static void traverseInstructionsInReverseOrder(@NotNull Instruction rootInstruction,
@NotNull LinkedHashSet<Instruction> instructions) {
if (instructions.contains(instruction)) return;
instructions.add(instruction);
for (Instruction previousInstruction : instruction.getPreviousInstructions()) {
traverseInstructionsInReverseOrder(previousInstruction, instructions);
Deque<Instruction> stack = Queues.newArrayDeque();
stack.push(rootInstruction);
List<Instruction> previousInstructions = Lists.newArrayList();
while ( !stack.isEmpty() ) {
final Instruction instruction = stack.pop();
if ( instructions.contains(instruction) )
continue;
instructions.add(instruction);
// Reverse iteration order to match the original recursive order.
previousInstructions.addAll(instruction.getPreviousInstructions());
for (Instruction previousInstruction : Lists.reverse(previousInstructions)) {
stack.push(previousInstruction);
}
previousInstructions.clear();
}
}
//for tests only
@NotNull
public List<Instruction> getAllInstructions() {
@@ -363,12 +376,28 @@ public class PseudocodeImpl implements Pseudocode {
return visited;
}
private void traverseNextInstructions(@NotNull Instruction instruction, @NotNull Set<Instruction> visited) {
if (visited.contains(instruction)) return;
visited.add(instruction);
for (Instruction nextInstruction : instruction.getNextInstructions()) {
if (nextInstruction == null) continue; //todo it might be null on incomplete code
traverseNextInstructions(nextInstruction, visited);
private static void traverseNextInstructions(@NotNull Instruction rootInstruction, @NotNull Set<Instruction> visited) {
Deque<Instruction> stack = Queues.newArrayDeque();
stack.push(rootInstruction);
List<Instruction> nextInstructions = Lists.newArrayList();
while (!stack.isEmpty()) {
final Instruction instruction = stack.pop();
if (visited.contains(instruction))
continue;
visited.add(instruction);
// Reverse iteration order to match the original recursive order.
nextInstructions.addAll(instruction.getNextInstructions());
for (Instruction nextInstruction : Lists.reverse(nextInstructions)) {
if ( nextInstruction == null )
continue;
stack.push(nextInstruction);
}
nextInstructions.clear();
}
}