commit d258cc5dac2f29c5eef66e6233c180a35c15b52a
author Morten Krogh-Jespersen <mkroghj@google.com> Fri Sep 11 10:43:48 2020 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Fri Sep 11 10:50:37 2020 +0000
tree 6509f9e8ebea605566649946051428e1c90420af
parent 82f2ed7ae1caba955ccdf25d46a9d80ecab2df74

Remove unchecked conversion in SimplePolicyExecutor

Change-Id: I990ed72319953966ea7d139f1166034ddb5870c6

src/main/java/com/android/tools/r8/horizontalclassmerging/SimplePolicyExecutor.java

diff --git a/src/main/java/com/android/tools/r8/horizontalclassmerging/SimplePolicyExecutor.java b/src/main/java/com/android/tools/r8/horizontalclassmerging/SimplePolicyExecutor.java
index fe7e76d..322958f 100644
--- a/src/main/java/com/android/tools/r8/horizontalclassmerging/SimplePolicyExecutor.java
+++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/SimplePolicyExecutor.java
@@ -26,13 +26,7 @@
     Iterator<Collection<DexProgramClass>> i = groups.iterator();
     while (i.hasNext()) {
       Collection<DexProgramClass> group = i.next();
-      Iterator<DexProgramClass> j = group.iterator();
-      while (j.hasNext()) {
-        DexProgramClass clazz = j.next();
-        if (!policy.canMerge(clazz)) {
-          j.remove();
-        }
-      }
+      group.removeIf(clazz -> !policy.canMerge(clazz));
       if (group.size() < 2) {
         i.remove();
       }
@@ -54,7 +48,7 @@
     LinkedList<Collection<DexProgramClass>> linkedGroups;
 
     if (inputGroups instanceof LinkedList) {
-      linkedGroups = (LinkedList) inputGroups;
+      linkedGroups = (LinkedList<Collection<DexProgramClass>>) inputGroups;
     } else {
       linkedGroups = new LinkedList<>(inputGroups);
     }