Merge "Make our code forward compatible with fastutils 8.2.1."
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java b/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
index 865e11c..bb29da9 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
@@ -1893,7 +1893,7 @@
}
// Move all normal successors to the new block.
- currentBlockInfo.normalSuccessors.forEach(info::addNormalSuccessor);
+ currentBlockInfo.normalSuccessors.forEach((Integer offset) -> info.addNormalSuccessor(offset));
currentBlockInfo.normalSuccessors.clear();
// Link the two blocks.
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/JarSourceCode.java b/src/main/java/com/android/tools/r8/ir/conversion/JarSourceCode.java
index fa7e4a3..34e43e3 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/JarSourceCode.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/JarSourceCode.java
@@ -434,14 +434,14 @@
}
// At the end of the current block, propagate the state to all successors and add the ones
// that changed to the worklist.
- item.blockInfo.normalSuccessors.iterator().forEachRemaining(offset -> {
+ item.blockInfo.normalSuccessors.iterator().forEachRemaining((Integer offset) -> {
if (state.recordStateForTarget(offset)) {
if (offset >= 0) {
worklist.add(new JarStateWorklistItem(CFG.get(offset.intValue()), offset));
}
}
});
- item.blockInfo.exceptionalSuccessors.iterator().forEachRemaining(offset -> {
+ item.blockInfo.exceptionalSuccessors.iterator().forEachRemaining((Integer offset) -> {
if (state.recordStateForExceptionalTarget(offset)) {
if (offset >= 0) {
worklist.add(new JarStateWorklistItem(CFG.get(offset.intValue()), offset));
