commit d6fc7bd9494a17f17080540d0d87b187f5dfba39
author Clément Béra <clementbera@google.com> Tue May 30 08:36:22 2023 +0200
committer Clément Béra <clementbera@google.com> Fri Jun 02 11:30:18 2023 +0000
tree 0bb31141bd9890ce29db2247abc9ce9a3384b988
parent 7cf891694baa1a9979daa762e3ac921bb408f99a

Use LinkedHashSet instead of afterward sorting

Change-Id: Ie576ab8aad7c4ff3fb6abe98ceb6ec733c0618d2

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

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/passes/SplitBranch.java b/src/main/java/com/android/tools/r8/ir/conversion/passes/SplitBranch.java
index 9a3a024..7e17e7e 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/passes/SplitBranch.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/passes/SplitBranch.java
@@ -20,6 +20,7 @@
 import com.google.common.collect.Sets;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -96,7 +97,7 @@
       // Then we can redirect any known value. This can lead to dead code.
       If theIf = block.exit().asIf();
       Set<Phi> allowedPhis = getAllowedPhis(nonConstNumberOperand(theIf).asPhi());
-      Set<Phi> foundPhis = Sets.newIdentityHashSet();
+      Set<Phi> foundPhis = new LinkedHashSet<>();
       WorkList.newIdentityWorkList(block)
           .process(
               (current, workList) -> {
@@ -135,9 +136,7 @@
           }
         }
       }
-      List<Phi> sortedFoundPhis = new ArrayList<>(foundPhis);
-      sortedFoundPhis.sort(Phi::compareTo);
-      for (Phi phi : sortedFoundPhis) {
+      for (Phi phi : foundPhis) {
         BasicBlock phiBlock = phi.getBlock();
         for (int i = 0; i < phi.getOperands().size(); i++) {
           Value value = phi.getOperand(i);