commit 2bcc3716b917b6b391f464dcc8d57df4824191c3
author Morten Krogh-Jespersen <mkroghj@google.com> Tue Oct 16 14:06:50 2018 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Tue Oct 16 12:08:56 2018 +0000
tree 70ab37346bf1a242024e215bac78b45b3a913f17
parent 39b9b3101a5fa8489b5ee5e71d1b6704d5f82b9e

Change varargs to list<T> for type safety

Change-Id: I6890b35e332d5ac4ac5831fc384efc55a8ba3c02

src/main/java/com/android/tools/r8/ir/optimize/peepholes/PeepholeHelper.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/peepholes/PeepholeHelper.java b/src/main/java/com/android/tools/r8/ir/optimize/peepholes/PeepholeHelper.java
index 55078e3..fb33451 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/peepholes/PeepholeHelper.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/peepholes/PeepholeHelper.java
@@ -6,15 +6,16 @@
 
 import com.android.tools.r8.ir.code.Instruction;
 import com.android.tools.r8.ir.code.InstructionListIterator;
+import java.util.List;
 import java.util.function.Predicate;
 
 public class PeepholeHelper {
 
   public static class PeepholeLayout {
     private Instruction[] instructions;
-    private Predicate<Instruction>[] predicates;
+    private List<Predicate<Instruction>> predicates;
 
-    public PeepholeLayout(Instruction[] instructions, Predicate<Instruction>... predicates) {
+    public PeepholeLayout(Instruction[] instructions, List<Predicate<Instruction>> predicates) {
       this.instructions = instructions;
       this.predicates = predicates;
     }
@@ -41,8 +42,8 @@
     }
   }
 
-  public static PeepholeLayout getLayout(Predicate<Instruction>... predicates) {
-    Instruction[] arr = new Instruction[predicates.length];
+  public static PeepholeLayout getLayout(List<Predicate<Instruction>> predicates) {
+    Instruction[] arr = new Instruction[predicates.size()];
     return new PeepholeLayout(arr, predicates);
   }