commit bc39aecfe208eb7e75c9599032343bf08a466277
author Christoffer Adamsen <christofferqa@google.com> Tue Mar 18 08:40:22 2025 +0000
committer Christoffer Adamsen <christofferqa@google.com> Tue Mar 18 21:46:39 2025 -0700
tree a40e3843585517a7d879887d5aa5992d7d9798c7
parent c0bce7d5c6b609b09edeea5e77baafc3f5c4e3f8

Fix bug in ConstantCanonicalizer causing inconsistent SSA

Change-Id: Ifaeac67e48b4b85a74dd235e2998814c9c559a52

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 db5c9dc..4633083 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
@@ -617,9 +617,7 @@
     assert insertionPoint.isPhi() || instructionIterator.peekPrevious() == insertionPoint;
     newInstruction.setPosition(
         getPositionForCanonicalizationConstantAtInsertionPoint(insertionPoint, newInstruction));
-    if (newInstruction.instructionTypeCanThrow()
-        && insertionPoint.getBlock().hasCatchHandlers()
-        && insertionPoint.getBlock().canThrow()) {
+    if (newInstruction.instructionTypeCanThrow() && insertionPoint.getBlock().hasCatchHandlers()) {
       // Split the block and rewind the block iterator to the insertion block.
       BasicBlock splitBlock =
           instructionIterator.splitCopyCatchHandlers(
@@ -638,7 +636,6 @@
           assert !splitBlock.canThrow();
           splitBlock.listIterator().add(newInstruction);
         } else {
-          assert splitBlock.canThrow();
           instructionIterator.addBeforeAndPositionBeforeNewInstruction(newInstruction);
         }
         instructionIterator.positionAfterPreviousInstruction(insertionPoint.asInstruction());