commit 07ced9320717640c7c77d3216e8b132d772cc45a
author Ian Zerny <zerny@google.com> Tue Nov 03 09:36:15 2020 +0100
committer Ian Zerny <zerny@google.com> Tue Nov 03 09:36:15 2020 +0100
tree daf0bfc6752fb355e8ed16edee19c755ca3018dc
parent 6796608dafeb67cfa3077468039d82f777bd82e4

Desugared library: Fix L8 determinism

- fix red bots

Change-Id: I191acc3acb420676104a72ee027b22689a528b22

src/main/java/com/android/tools/r8/ir/desugar/InterfaceMethodRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/InterfaceMethodRewriter.java b/src/main/java/com/android/tools/r8/ir/desugar/InterfaceMethodRewriter.java
index 36a1647..9141aad 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/InterfaceMethodRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/InterfaceMethodRewriter.java
@@ -556,7 +556,9 @@
     // TODO(b/134732760): deal with retarget-core-library-member.
     Map<DexType, List<DexType>> emulatedInterfacesHierarchy = new IdentityHashMap<>();
     Set<DexType> processed = Sets.newIdentityHashSet();
-    for (DexType interfaceType : emulatedInterfaces.keySet()) {
+    ArrayList<DexType> emulatedInterfacesSorted = new ArrayList<>(emulatedInterfaces.keySet());
+    emulatedInterfacesSorted.sort(DexType::slowCompareTo);
+    for (DexType interfaceType : emulatedInterfacesSorted) {
       processEmulatedInterfaceHierarchy(interfaceType, processed, emulatedInterfacesHierarchy);
     }
     return emulatedInterfacesHierarchy;