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

removed cached reversedInstructions and deadInstructions

Browse Source
This commit is contained in:
Svetlana Isakova
2012-12-14 15:47:40 +04:00
parent 6e8ac23689
commit dc3e324987
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/PseudocodeImpl.java
+10 -19
View File
@@ -77,8 +77,6 @@ public class PseudocodeImpl implements Pseudocode {
private final List<Instruction> mutableInstructionList = new ArrayList<Instruction>(); private final List<Instruction> mutableInstructionList = new ArrayList<Instruction>();
private final List<Instruction> instructions = new ArrayList<Instruction>(); private final List<Instruction> instructions = new ArrayList<Instruction>();
private List<Instruction> reversedInstructions = null;
private List<Instruction> deadInstructions;
private Set<LocalDeclarationInstruction> localDeclarations = null; private Set<LocalDeclarationInstruction> localDeclarations = null;
//todo getters //todo getters
@@ -139,21 +137,18 @@ public class PseudocodeImpl implements Pseudocode {
@NotNull @NotNull
@Override @Override
public List<Instruction> getReversedInstructions() { public List<Instruction> getReversedInstructions() {
if (reversedInstructions == null) { LinkedHashSet<Instruction> traversedInstructions = Sets.newLinkedHashSet();
LinkedHashSet<Instruction> traversedInstructions = Sets.newLinkedHashSet(); traverseFollowingInstructions(sinkInstruction, traversedInstructions, false);
traverseFollowingInstructions(sinkInstruction, traversedInstructions, false); if (traversedInstructions.size() < instructions.size()) {
if (traversedInstructions.size() < instructions.size()) { List<Instruction> simplyReversedInstructions = Lists.newArrayList(instructions);
List<Instruction> simplyReversedInstructions = Lists.newArrayList(instructions); Collections.reverse(simplyReversedInstructions);
Collections.reverse(simplyReversedInstructions); for (Instruction instruction : simplyReversedInstructions) {
for (Instruction instruction : simplyReversedInstructions) { if (!traversedInstructions.contains(instruction)) {
if (!traversedInstructions.contains(instruction)) { traverseFollowingInstructions(instruction, traversedInstructions, false);
traverseFollowingInstructions(instruction, traversedInstructions, false);
}
} }
} }
reversedInstructions = Lists.newArrayList(traversedInstructions);
} }
return reversedInstructions; return Lists.newArrayList(traversedInstructions);
} }
//for tests only //for tests only
@@ -165,11 +160,7 @@ public class PseudocodeImpl implements Pseudocode {
@Override @Override
@NotNull @NotNull
public List<Instruction> getDeadInstructions() { public List<Instruction> getDeadInstructions() {
if (deadInstructions != null) { List<Instruction> deadInstructions = Lists.newArrayList();
return deadInstructions;
}
deadInstructions = Lists.newArrayList();
for (Instruction instruction : mutableInstructionList) { for (Instruction instruction : mutableInstructionList) {
if (isDead(instruction)) { if (isDead(instruction)) {
deadInstructions.add(instruction); deadInstructions.add(instruction);