commit 41d495cbbd9756e236912fd4924bf1f79fa9b244
author Christoffer Quist Adamsen <christofferqa@google.com> Tue May 17 16:21:22 2022 +0200
committer Christoffer Adamsen <christofferqa@google.com> Tue May 17 14:27:08 2022 +0000
tree b264b0f90d414293a3df2933651d59e5e2838d7d
parent 866bfe6841822bcf5e4a14506305249d2618ae88

Remove sorting of values prior to type propagation

Fixes: b/228144455
Change-Id: I02022c8f8c2c5d1b99286f14c76118c6be0c054b

src/main/java/com/android/tools/r8/ir/analysis/type/TypeAnalysis.java

diff --git a/src/main/java/com/android/tools/r8/ir/analysis/type/TypeAnalysis.java b/src/main/java/com/android/tools/r8/ir/analysis/type/TypeAnalysis.java
index 879e5a3..a0fd66f 100644
--- a/src/main/java/com/android/tools/r8/ir/analysis/type/TypeAnalysis.java
+++ b/src/main/java/com/android/tools/r8/ir/analysis/type/TypeAnalysis.java
@@ -14,11 +14,8 @@
 import com.android.tools.r8.ir.code.Phi;
 import com.android.tools.r8.ir.code.Value;
 import com.android.tools.r8.shaking.AppInfoWithLiveness;
-import com.google.common.collect.Lists;
 import java.util.ArrayDeque;
-import java.util.Comparator;
 import java.util.Deque;
-import java.util.List;
 
 public class TypeAnalysis {
 
@@ -72,11 +69,7 @@
   }
 
   public void narrowing(Iterable<? extends Value> values) {
-    // TODO(b/125492155) Not sorting causes us to have non-deterministic behaviour. This should be
-    //  removed when the bug is fixed.
-    List<Value> sortedValues = Lists.newArrayList(values);
-    sortedValues.sort(Comparator.comparingInt(Value::getNumber));
-    analyzeValues(sortedValues, Mode.NARROWING);
+    analyzeValues(values, Mode.NARROWING);
   }
 
   public boolean verifyValuesUpToDate(Iterable<? extends Value> values) {