commit d5f5fd618312b73df1491388ec6bf06d3fe5d87f
author Clément Béra <clementbera@google.com> Thu Jun 15 14:50:35 2023 +0200
committer Clément Béra <clementbera@google.com> Thu Jun 15 14:50:35 2023 +0200
tree 0bd8bbb7706cebeccb7eb9637ce21aeed3424471
parent 0c87082e8cca789818a2567f972b20086cfbc532

Fix redundant blocks

Change-Id: I309771d42590ccd52861ebb8d5a2c81399450efa

src/main/java/com/android/tools/r8/horizontalclassmerging/code/ClassInitializerMerger.java

diff --git a/src/main/java/com/android/tools/r8/horizontalclassmerging/code/ClassInitializerMerger.java b/src/main/java/com/android/tools/r8/horizontalclassmerging/code/ClassInitializerMerger.java
index 09e9911..b4d26cd 100644
--- a/src/main/java/com/android/tools/r8/horizontalclassmerging/code/ClassInitializerMerger.java
+++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/code/ClassInitializerMerger.java
@@ -280,6 +280,9 @@
       // Cleanup.
       code.removeBlocks(blocksToRemove);
       code.removeAllDeadAndTrivialPhis();
+      code.removeRedundantBlocks();
+
+      assert code.isConsistentSSA(appView);
 
       return code;
     }