commit 9f5fd6a589f578d8bf4d0364cf95d3136a766539
author Clément Béra <clementbera@google.com> Tue May 23 08:48:17 2023 +0200
committer Clément Béra <clementbera@google.com> Tue May 23 06:50:55 2023 +0000
tree a254f19ff5a033bb8dd4470971aac525ec99b8e7
parent 7708ee9f29f8f91c6fee6b65565972bc153b48bf

Make SplitBranchOnKnownBoolean deterministic

- fix red bot

Change-Id: I20c814324132b2f0c9c0d4727879304751c1bfb2

src/main/java/com/android/tools/r8/ir/conversion/passes/SplitBranchOnKnownBoolean.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/passes/SplitBranchOnKnownBoolean.java b/src/main/java/com/android/tools/r8/ir/conversion/passes/SplitBranchOnKnownBoolean.java
index 942499a..134d2bc 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/passes/SplitBranchOnKnownBoolean.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/passes/SplitBranchOnKnownBoolean.java
@@ -120,7 +120,9 @@
           }
         }
       }
-      for (Phi phi : foundPhis) {
+      List<Phi> sortedFoundPhis = new ArrayList<>(foundPhis);
+      sortedFoundPhis.sort(Phi::compareTo);
+      for (Phi phi : sortedFoundPhis) {
         BasicBlock phiBlock = phi.getBlock();
         for (int i = 0; i < phi.getOperands().size(); i++) {
           Value value = phi.getOperand(i);