commit 47e4d71c282e075950eae532d9147b51fc741837
author Søren Gjesse <sgjesse@google.com> Wed Jun 14 09:50:41 2023 +0200
committer Søren Gjesse <sgjesse@google.com> Wed Jun 14 07:58:54 2023 +0000
tree 232213727992b19b69c3d3312931807ab2c90880
parent 956f3b37577bfc9d819b72c0e09a5e8e5f0dd5a8

Remove redundant blocks in enum unboxer

Bug: b/281975144
Change-Id: I192580be4c42cb4913f5589ead4942462a919203

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingRewriter.java
index 05648c3..fa88164 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingRewriter.java
@@ -431,6 +431,7 @@
         }
       }
     }
+    code.removeRedundantBlocks();
     assert code.isConsistentSSABeforeTypesAreCorrect(appView);
     return affectedPhis;
   }