commit 50fd14b8b61e0c71d4b82e91b00b62bab546a4e5
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Sep 28 08:27:08 2018 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Sep 28 08:27:08 2018 +0200
tree 735631e6f856733ab5a115fc8a4e00721b3adb25
parent e790fa569c271c5735718a1f97faa4bce19b96f2

Disable shuffling in CallGraph

Bug: 116282409
Change-Id: I8f0b7e8e05d2b785dbd2a27d9bd9df505729f5fb

src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java b/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java
index 7b9ce55..524de92 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java
@@ -232,7 +232,8 @@
     });
     Set<DexEncodedMethod> methods =
         leaves.stream().map(x -> x.method).collect(Collectors.toCollection(LinkedHashSet::new));
-    return shuffle.order(methods);
+    // TODO(b/116282409): Resolve why shuffling makes art.none.r8.Art800_smaliTest flaky.
+    return methods;
   }
 
   public static class CycleEliminator {