commit 152e210f9cf4c705c87b9253d2056674a853ea89
author Clément Béra <clementbera@google.com> Thu Sep 23 12:33:49 2021 +0000
committer Clément Béra <clementbera@google.com> Thu Sep 23 13:14:33 2021 +0000
tree acbe9a37b771524a5c567fb4312f60413defc96a
parent 4831b55933564ba346c5b87c9d13320d2bb3b203

Fix EmptyEnumUnboxer

Bug: 200924915
Change-Id: Icadb1afaeaea95431ebc62403056b8c06eea5bed

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/enums/EmptyEnumUnboxer.java b/src/main/java/com/android/tools/r8/ir/optimize/enums/EmptyEnumUnboxer.java
index 2fb3b5a..9320e54 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/enums/EmptyEnumUnboxer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/enums/EmptyEnumUnboxer.java
@@ -16,7 +16,7 @@
 import com.android.tools.r8.ir.conversion.PostMethodProcessor.Builder;
 import com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed;
 import com.android.tools.r8.shaking.AppInfoWithLiveness;
-import java.util.Collections;
+import com.google.common.collect.Sets;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
@@ -47,8 +47,7 @@
 
   @Override
   public Set<Phi> rewriteCode(IRCode code, MethodProcessor methodProcessor) {
-    // Intentionally empty.
-    return Collections.emptySet();
+    return Sets.newIdentityHashSet();
   }
 
   @Override