commit 7283ec28898a8002f849c5237582dd5e048ee463
author Clément Béra <clementbera@google.com> Mon Jun 19 10:22:05 2023 +0200
committer Clément Béra <clementbera@google.com> Mon Jun 19 08:25:01 2023 +0000
tree 8a96435557f12997833d10ef03ce9bfea83e6b80
parent 5e8d3427d1107663cd65d8dc05fe131c7bdaea9a

Remove more redundant blocks

Change-Id: I5d758440e910d0b64cf6504d67405b808f1a064e

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/ClassInitializerDefaultsOptimization.java b/src/main/java/com/android/tools/r8/ir/optimize/ClassInitializerDefaultsOptimization.java
index 8d2b4bb..9c94862 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/ClassInitializerDefaultsOptimization.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/ClassInitializerDefaultsOptimization.java
@@ -301,6 +301,9 @@
       fieldsWithStaticValues.forEach(DexEncodedField::setStaticValue);
     }
 
+    if (!fieldsWithStaticValues.isEmpty()) {
+      code.removeRedundantBlocks();
+    }
     return new ClassInitializerDefaultsResult(fieldsWithStaticValues);
   }
 

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/RuntimeWorkaroundCodeRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/RuntimeWorkaroundCodeRewriter.java
index 855f985..02e3b25 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/RuntimeWorkaroundCodeRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/RuntimeWorkaroundCodeRewriter.java
@@ -78,7 +78,7 @@
   }
 
   private static void rewriteSwitchForMaxIntOnly(IRCode code, AppView<?> appView) {
-    boolean needToSplitCriticalEdges = false;
+    boolean hasChanged = false;
     BranchSimplifier branchSimplifier = new BranchSimplifier(appView);
     ListIterator<BasicBlock> blocksIterator = code.listIterator();
     while (blocksIterator.hasNext()) {
@@ -108,7 +108,7 @@
                   ImmutableList.of(newSwitchSequences),
                   outliers);
             }
-            needToSplitCriticalEdges = true;
+            hasChanged = true;
           }
         }
       }
@@ -117,8 +117,9 @@
     // Rewriting of switches introduces new branching structure. It relies on critical edges
     // being split on the way in but does not maintain this property. We therefore split
     // critical edges at exit.
-    if (needToSplitCriticalEdges) {
+    if (hasChanged) {
       code.splitCriticalEdges();
+      code.removeRedundantBlocks();
     }
   }