commit 1989a6b59e0ceb6c67f4ebe256b660c59abf287a
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jun 29 09:45:00 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Jun 29 07:45:20 2021 +0000
tree 58b8ab88ca1329954af9f11de6bbb8f0719c71ab
parent 60763f09a2196496a1e69b20db3d276aaa95603e

Ensure enum unboxing utility methods have deterministic order

Fixes: 192314045
Change-Id: Idf101d7dc234fdc907a0c10c7a02776bcf75bf26

src/main/java/com/android/tools/r8/ir/optimize/enums/LocalEnumUnboxingUtilityClass.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/enums/LocalEnumUnboxingUtilityClass.java b/src/main/java/com/android/tools/r8/ir/optimize/enums/LocalEnumUnboxingUtilityClass.java
index 3f018a5..5734b8b 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/enums/LocalEnumUnboxingUtilityClass.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/enums/LocalEnumUnboxingUtilityClass.java
@@ -186,7 +186,7 @@
                   SyntheticKind.ENUM_UNBOXING_LOCAL_UTILITY_CLASS,
                   enumToUnbox,
                   appView,
-                  emptyConsumer());
+                  builder -> builder.setUseSortedMethodBacking(true));
       assert clazz.getAccessFlags().equals(ClassAccessFlags.createPublicFinalSynthetic());
       return clazz;
     }

src/main/java/com/android/tools/r8/ir/optimize/enums/SharedEnumUnboxingUtilityClass.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/enums/SharedEnumUnboxingUtilityClass.java b/src/main/java/com/android/tools/r8/ir/optimize/enums/SharedEnumUnboxingUtilityClass.java
index 7fb8c6f..e0cfc2a 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/enums/SharedEnumUnboxingUtilityClass.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/enums/SharedEnumUnboxingUtilityClass.java
@@ -240,7 +240,8 @@
                             ImmutableList.of(
                                 createClassInitializer(sharedUtilityClassType, valuesField),
                                 createValuesMethod(sharedUtilityClassType, valuesField)))
-                        .setStaticFields(ImmutableList.of(valuesField));
+                        .setStaticFields(ImmutableList.of(valuesField))
+                        .setUseSortedMethodBacking(true);
                   });
       assert clazz.getAccessFlags().equals(ClassAccessFlags.createPublicFinalSynthetic());
       return clazz;