s/code.blocks.listIterator/code.listIterator
Change-Id: Ia0b19a846a018bf84a73af6c735b0f1de11dfb1a
diff --git a/src/main/java/com/android/tools/r8/cf/LoadStoreHelper.java b/src/main/java/com/android/tools/r8/cf/LoadStoreHelper.java
index 9a73ab1..94bfcc6 100644
--- a/src/main/java/com/android/tools/r8/cf/LoadStoreHelper.java
+++ b/src/main/java/com/android/tools/r8/cf/LoadStoreHelper.java
@@ -99,7 +99,7 @@
public void insertLoadsAndStores() {
clonableConstants = new IdentityHashMap<>();
- blockIterator = code.blocks.listIterator();
+ blockIterator = code.listIterator();
while (blockIterator.hasNext()) {
InstructionListIterator it = blockIterator.next().listIterator();
while (it.hasNext()) {
diff --git a/src/main/java/com/android/tools/r8/ir/code/BasicBlockInstructionIterator.java b/src/main/java/com/android/tools/r8/ir/code/BasicBlockInstructionIterator.java
index 9aa0cba..63e83d7 100644
--- a/src/main/java/com/android/tools/r8/ir/code/BasicBlockInstructionIterator.java
+++ b/src/main/java/com/android/tools/r8/ir/code/BasicBlockInstructionIterator.java
@@ -547,7 +547,7 @@
// Position the block iterator cursor just after the invoke block.
if (blocksIterator == null) {
// If no block iterator was passed create one for the insertion of the inlinee blocks.
- blocksIterator = code.blocks.listIterator(code.blocks.indexOf(invokeBlock));
+ blocksIterator = code.listIterator(code.blocks.indexOf(invokeBlock));
} else {
// If a block iterator was passed, back up to the block with the invoke instruction.
blocksIterator.previous();
diff --git a/src/main/java/com/android/tools/r8/ir/code/Goto.java b/src/main/java/com/android/tools/r8/ir/code/Goto.java
index a14098d..a6f906c 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Goto.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Goto.java
@@ -97,7 +97,7 @@
public boolean isTrivialGotoToTheNextBlock(IRCode code) {
BasicBlock thisBlock = getBlock();
- ListIterator<BasicBlock> blockIterator = code.blocks.listIterator();
+ ListIterator<BasicBlock> blockIterator = code.listIterator();
while (blockIterator.hasNext()) {
BasicBlock block = blockIterator.next();
if (thisBlock == block) {
diff --git a/src/main/java/com/android/tools/r8/ir/code/IRCodeInstructionsIterator.java b/src/main/java/com/android/tools/r8/ir/code/IRCodeInstructionsIterator.java
index cdb40bf..03dd1fa 100644
--- a/src/main/java/com/android/tools/r8/ir/code/IRCodeInstructionsIterator.java
+++ b/src/main/java/com/android/tools/r8/ir/code/IRCodeInstructionsIterator.java
@@ -13,7 +13,7 @@
private InstructionListIterator instructionIterator;
public IRCodeInstructionsIterator(IRCode code) {
- blockIterator = code.blocks.listIterator();
+ blockIterator = code.listIterator();
instructionIterator = blockIterator.next().listIterator();
}
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java b/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java
index c9e30e2..ebfcc7f 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/CfBuilder.java
@@ -63,7 +63,6 @@
import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
@@ -264,7 +263,7 @@
emittedLabels = new HashSet<>(code.blocks.size());
newInstanceLabels = new HashMap<>(initializers.size());
instructions = new ArrayList<>();
- Iterator<BasicBlock> blockIterator = code.blocks.iterator();
+ ListIterator<BasicBlock> blockIterator = code.listIterator();
BasicBlock block = blockIterator.next();
CfLabel tryCatchStart = null;
CatchHandlers<BasicBlock> tryCatchHandlers = CatchHandlers.EMPTY_BASIC_BLOCK;
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java b/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java
index b7b425f..b49b5a8 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/DexBuilder.java
@@ -496,7 +496,7 @@
if (ifsNeedingRewrite.isEmpty()) {
return;
}
- ListIterator<BasicBlock> it = ir.blocks.listIterator();
+ ListIterator<BasicBlock> it = ir.listIterator();
while (it.hasNext()) {
BasicBlock block = it.next();
if (ifsNeedingRewrite.contains(block)) {
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java b/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java
index 5f340d7..48092b0 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java
@@ -93,7 +93,7 @@
GraphLense graphLense = appView.graphLense();
Set<Value> newSSAValues = Sets.newIdentityHashSet();
- ListIterator<BasicBlock> blocks = code.blocks.listIterator();
+ ListIterator<BasicBlock> blocks = code.listIterator();
boolean mayHaveUnreachableBlocks = false;
while (blocks.hasNext()) {
BasicBlock block = blocks.next();
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/MemberValuePropagation.java b/src/main/java/com/android/tools/r8/ir/optimize/MemberValuePropagation.java
index 9cb322e..c0f7ac9 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/MemberValuePropagation.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/MemberValuePropagation.java
@@ -364,7 +364,7 @@
public void rewriteWithConstantValues(
IRCode code, DexType callingContext, Predicate<DexEncodedMethod> isProcessedConcurrently) {
Set<Value> affectedValues = Sets.newIdentityHashSet();
- ListIterator<BasicBlock> blocks = code.blocks.listIterator();
+ ListIterator<BasicBlock> blocks = code.listIterator();
while (blocks.hasNext()) {
BasicBlock block = blocks.next();
InstructionListIterator iterator = block.listIterator();
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/NonNullTracker.java b/src/main/java/com/android/tools/r8/ir/optimize/NonNullTracker.java
index 8ae641f..ee6b4b8 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/NonNullTracker.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/NonNullTracker.java
@@ -25,6 +25,7 @@
import com.android.tools.r8.ir.code.Value;
import com.android.tools.r8.ir.conversion.OptimizationFeedback;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Predicates;
import com.google.common.collect.Sets;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
@@ -78,7 +79,7 @@
}
public void addNonNull(IRCode code) {
- addNonNullInPart(code, code.blocks.listIterator(), b -> true);
+ addNonNullInPart(code, code.listIterator(), Predicates.alwaysTrue());
}
public void addNonNullInPart(
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/Outliner.java b/src/main/java/com/android/tools/r8/ir/optimize/Outliner.java
index aee0056..be5525e 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/Outliner.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/Outliner.java
@@ -1317,7 +1317,7 @@
public void applyOutliningCandidate(IRCode code, DexEncodedMethod method) {
assert !(method.getCode() instanceof OutlineCode);
- ListIterator<BasicBlock> blocksIterator = code.blocks.listIterator();
+ ListIterator<BasicBlock> blocksIterator = code.listIterator();
while (blocksIterator.hasNext()) {
BasicBlock block = blocksIterator.next();
List<Integer> toRemove = new ArrayList<>();
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/peepholes/BasicBlockMuncher.java b/src/main/java/com/android/tools/r8/ir/optimize/peepholes/BasicBlockMuncher.java
index 2d4bb17..eb2df21 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/peepholes/BasicBlockMuncher.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/peepholes/BasicBlockMuncher.java
@@ -35,7 +35,7 @@
}
private static void runPeepholes(IRCode code, List<BasicBlockPeephole> peepholes) {
- ListIterator<BasicBlock> blocksIterator = code.blocks.listIterator(code.blocks.size());
+ ListIterator<BasicBlock> blocksIterator = code.listIterator(code.blocks.size());
while (blocksIterator.hasPrevious()) {
BasicBlock currentBlock = blocksIterator.previous();
InstructionListIterator it =
diff --git a/src/test/java/com/android/tools/r8/ir/InlineTest.java b/src/test/java/com/android/tools/r8/ir/InlineTest.java
index 97c7b0a..1a2c180 100644
--- a/src/test/java/com/android/tools/r8/ir/InlineTest.java
+++ b/src/test/java/com/android/tools/r8/ir/InlineTest.java
@@ -297,7 +297,7 @@
// Run code inlining all invokes with a.
test = codeForMultipleMethodReplaceTest(a, b);
- ListIterator<BasicBlock> blocksIterator = test.code.blocks.listIterator();
+ ListIterator<BasicBlock> blocksIterator = test.code.listIterator();
Iterator<IRCode> inlinee = test.additionalCode.listIterator(); // IR code for a's
List<BasicBlock> blocksToRemove = new ArrayList<>();
while (blocksIterator.hasNext()) {
@@ -316,7 +316,7 @@
// Run code inlining all invokes with b.
test = codeForMultipleMethodReplaceTest(a, b);
- blocksIterator = test.code.blocks.listIterator();
+ blocksIterator = test.code.listIterator();
inlinee = test.additionalCode.listIterator(3); // IR code for b's
while (blocksIterator.hasNext()) {
BasicBlock block = blocksIterator.next();
@@ -768,7 +768,7 @@
{
// Run code inlining all invokes with a.
TestApplication test = codeForInlineAlwaysThrowsMultiple(twoGuards);
- ListIterator<BasicBlock> blocksIterator = test.code.blocks.listIterator();
+ ListIterator<BasicBlock> blocksIterator = test.code.listIterator();
Iterator<IRCode> inlinee = test.additionalCode.listIterator(); // IR code for a's.
List<BasicBlock> blocksToRemove = new ArrayList<>();
InstructionListIterator iterator;
@@ -792,7 +792,7 @@
{
// Run code inlining all invokes with b.
TestApplication test = codeForInlineAlwaysThrowsMultiple(twoGuards);
- ListIterator<BasicBlock> blocksIterator = test.code.blocks.listIterator();
+ ListIterator<BasicBlock> blocksIterator = test.code.listIterator();
Iterator<IRCode> inlinee = test.additionalCode.listIterator(3); // IR code for b's.
List<BasicBlock> blocksToRemove = new ArrayList<>();
InstructionListIterator iterator;
@@ -924,7 +924,7 @@
{
// Run code inlining all invokes with a.
TestApplication test = codeForInlineAlwaysThrowsMultipleWithControlFlow(a, twoGuards);
- ListIterator<BasicBlock> blocksIterator = test.code.blocks.listIterator();
+ ListIterator<BasicBlock> blocksIterator = test.code.listIterator();
Iterator<IRCode> inlinee = test.additionalCode.listIterator(); // IR code for a's.
List<BasicBlock> blocksToRemove = new ArrayList<>();
InstructionListIterator iterator;
@@ -948,7 +948,7 @@
{
// Run code inlining all invokes with b.
TestApplication test = codeForInlineAlwaysThrowsMultipleWithControlFlow(a, twoGuards);
- ListIterator<BasicBlock> blocksIterator = test.code.blocks.listIterator();
+ ListIterator<BasicBlock> blocksIterator = test.code.listIterator();
Iterator<IRCode> inlinee = test.additionalCode.listIterator(3); // IR code for b's.
List<BasicBlock> blocksToRemove = new ArrayList<>();
InstructionListIterator iterator;
