commit b26942d49db4a7d5d460a8a96066ef8e9b905300
author Christoffer Adamsen <christofferqa@google.com> Tue Jun 17 06:29:02 2025 +0200
committer Christoffer Adamsen <christofferqa@google.com> Tue Jun 17 01:51:05 2025 -0700
tree 409f3fbf41ae6df03205a11b42da0e79dd9a5a9c
parent 96c54ebdc2a87ffd74745c8bd2f6af3d820c6b22

Minor update to predecessor block sharing

This fixes the build errors on the dump column.

Change-Id: If7c2183678f43b251e6942e7540d28139d91063d
Test: ./tools/run_on_app_dump.py --app iosched --shrinker r8-nolib

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java b/src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java
index e24d296..5c801f7 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java
@@ -506,9 +506,9 @@
             exit.setPosition(otherPred.getPosition());
             pred.getInstructions().addLast(exit);
 
-            // If `otherPred` is a catch handler, then we cannot `goto otherPred`. In this case we
-            // therefore eliminate the goto and remove the `pred` block.
-            if (pred.isCatchHandler()) {
+            // If `otherPred` is a catch handler with a `move-exception`, then we cannot
+            // `goto otherPred`. In this case we eliminate the goto and remove the `pred` block.
+            if (otherPred.entry().isMoveException()) {
               unlinkTrivialGotoBlock(pred, otherPred);
               blocksToRemove.add(pred);
             }