commit 7b106889070d0fc5a2104815858e1c5cc17ceb67
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Jan 24 16:06:57 2024 +0100
committer Christoffer Adamsen <christofferqa@google.com> Wed Jan 24 15:09:58 2024 +0000
tree 36c7cf60588c5f1e10a27b32129a77629b7ce634
parent 0a814fcf4bf1a304e9a5eaf924043bc4b2415259

Finalize to LIR immediately after lens code rewriting

Change-Id: Ibe1f4d265a027ed390e8dca876d2467b53ec6f61

src/main/java/com/android/tools/r8/verticalclassmerging/VerticalClassMerger.java

diff --git a/src/main/java/com/android/tools/r8/verticalclassmerging/VerticalClassMerger.java b/src/main/java/com/android/tools/r8/verticalclassmerging/VerticalClassMerger.java
index 7f0e707..26ff3b6 100644
--- a/src/main/java/com/android/tools/r8/verticalclassmerging/VerticalClassMerger.java
+++ b/src/main/java/com/android/tools/r8/verticalclassmerging/VerticalClassMerger.java
@@ -272,11 +272,9 @@
                 OptimizationFeedbackIgnore.getInstance(),
                 methodProcessor,
                 methodProcessingContext,
-                // TODO(b/321171043): Set setFinalizeAfterLensCodeRewriter() on the
-                //  MethodConversionOptions to improve build speed (no need to run all
-                //  optimizations!). A prerequisite for this is that we remove all uses of force
-                //  inlining in the vertical class merger.
-                MethodConversionOptions.forLirPhase(appView)),
+                MethodConversionOptions.forLirPhase(appView)
+                    .disableStringSwitchConversion()
+                    .setFinalizeAfterLensCodeRewriter()),
         options.getThreadingModule(),
         executorService);