commit 402ccfd1f4d23af6a2bff29fb924218ff3e1f995
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Aug 31 10:00:10 2022 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Aug 31 10:00:10 2022 +0200
tree 995f1886c5be5b835d887cf6df6591caff449972
parent 26c6920b524dc69563c3adb22f3f99c78e355388

Use target catch handlers as initial seed for catch handler blocks

Bug: b/243678704
Change-Id: Ie0a0d9b4dde1275b9f600ea0798c423a3f2ae3ff

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/ConstantCanonicalizer.java b/src/main/java/com/android/tools/r8/ir/optimize/ConstantCanonicalizer.java
index 5275a80..eb7671a 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/ConstantCanonicalizer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/ConstantCanonicalizer.java
@@ -139,11 +139,9 @@
 
   private Set<BasicBlock> computeDirectAndIndirectCatchHandlerBlocks() {
     WorkList<BasicBlock> catchHandlerBlocks = WorkList.newIdentityWorkList();
-    for (BasicBlock block : code.getBlocks()) {
-      if (block.entry().isMoveException()) {
-        catchHandlerBlocks.addIfNotSeen(block);
-      }
-    }
+    code.getBlocks()
+        .forEach(
+            block -> catchHandlerBlocks.addIfNotSeen(block.getCatchHandlers().getAllTargets()));
     while (catchHandlerBlocks.hasNext()) {
       BasicBlock block = catchHandlerBlocks.next();
       catchHandlerBlocks.addIfNotSeen(block.getSuccessors());