commit 2ee4df2b7265e4ddea5e1c2ba1c0e95636c18dc8
author Clément Béra <clementbera@google.com> Fri Jun 16 12:35:26 2023 +0200
committer Clément Béra <clementbera@google.com> Fri Jun 16 10:45:22 2023 +0000
tree fced09ced43852641f7324523f76276ab2916b25
parent 5d36716242d8728007bfccdb4965cc9641c2afa0

Add redundant block check

Change-Id: I23f0eb4fc71ef8e21e1024d55e292be7f8401849

src/main/java/com/android/tools/r8/ir/optimize/AssertionsRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/AssertionsRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/AssertionsRewriter.java
index e1f8d9b..e32a6f5 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/AssertionsRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/AssertionsRewriter.java
@@ -344,10 +344,11 @@
       DexEncodedMethod method, IRCode code, DeadCodeRemover deadCodeRemover, Timing timing) {
     if (enabled) {
       timing.begin("Rewrite assertions");
-      if (runInternal(method, code)) {
+      boolean needsDeadCodeRemoval = runInternal(method, code);
+      code.removeRedundantBlocks();
+      if (needsDeadCodeRemoval) {
         deadCodeRemover.run(code, timing);
       }
-      code.removeRedundantBlocks();
       assert code.isConsistentSSA(appView);
       timing.end();
     }