commit d7ea9894b20e53c99f5e1cc56969c326703b6e57
author Andrew Grieve <agrieve@google.com> Wed Jan 03 15:40:36 2024 -0500
committer Andrew Grieve <agrieve@google.com> Thu Jan 04 14:36:29 2024 +0000
tree ef2d099c31acc254ac1a7c63ec8e683439b5324d
parent 566046ea4f6795375e630f1862215bbbc645b89f

Remove redundant call to removeRedundantBlocks() in ArrayConstructionSimplifier

The last thing simplifyArrayConstructionBlock() does is call
removeRedundantBlocks(), so callers of it need not call it themselves.

Bug: None
Change-Id: I162ca092b704601ed00f614b5c7b4bc41e3692fd

src/main/java/com/android/tools/r8/ir/conversion/passes/ArrayConstructionSimplifier.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/passes/ArrayConstructionSimplifier.java b/src/main/java/com/android/tools/r8/ir/conversion/passes/ArrayConstructionSimplifier.java
index 2a93788..b0cac47 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/passes/ArrayConstructionSimplifier.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/passes/ArrayConstructionSimplifier.java
@@ -96,9 +96,6 @@
       BasicBlock block = worklist.next();
       hasChanged |= simplifyArrayConstructionBlock(block, worklist, code, appView.options());
     }
-    if (hasChanged) {
-      code.removeRedundantBlocks();
-    }
     return CodeRewriterResult.hasChanged(hasChanged);
   }