Remove sorting of values prior to type propagation Fixes: b/228144455 Change-Id: I02022c8f8c2c5d1b99286f14c76118c6be0c054b
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) {