commit 27fa7cf63641904821a8327723707790160b9009
author Ian Zerny <zerny@google.com> Mon Nov 20 13:02:13 2023 +0100
committer Ian Zerny <zerny@google.com> Mon Nov 20 12:55:08 2023 +0000
tree c887fe46dbd4826d99e29374921757b5701bc5f7
parent b2bcca97e2cd151937497af71f5502d6c163d078

Continue to shorten live ranges of constants in debug mode

Not shorting live ranges leads to regressions in size and performance.
We should continue to shorten them until we have heuristics to avoid
such regressions.

This is a partial revert of commit
3a2cefc72d2ccb39bb1ab6f12cd818c5d17fba94

Bug: b/302281605
Bug: b/311649087
Bug: b/311223324
Change-Id: I44824d73bed15b712f70e47e1c0da0d1b8e956f0

src/main/java/com/android/tools/r8/ir/conversion/passes/DexConstantOptimizer.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/passes/DexConstantOptimizer.java b/src/main/java/com/android/tools/r8/ir/conversion/passes/DexConstantOptimizer.java
index 25fd979..89b6f2d 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/passes/DexConstantOptimizer.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/passes/DexConstantOptimizer.java
@@ -232,10 +232,6 @@
   }
 
   private void shortenLiveRanges(IRCode code, ConstantCanonicalizer canonicalizer) {
-    if (options.debug) {
-      // Shorten live ranges seems to regress code size in debug mode.
-      return;
-    }
     if (options.testing.disableShortenLiveRanges) {
       return;
     }

src/test/java/com/android/tools/r8/R8RunArtTestsTest.java

diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index efbc507..0bc2093 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -634,19 +634,12 @@
           // null to static field.
           .put(
               "134-reg-promotion",
-              TestCondition.or(
-                  TestCondition.match(
-                      compilers(CompilerUnderTest.R8),
-                      TestCondition.runtimes(DexVm.Version.V10_0_0, DexVm.Version.V12_0_0)),
-                  TestCondition.match(
-                      compilers(CompilerUnderTest.D8_AFTER_R8CF, CompilerUnderTest.R8_AFTER_D8),
-                      TestCondition.runtimes(
-                          DexVm.Version.V4_0_4,
-                          DexVm.Version.V8_1_0,
-                          DexVm.Version.V9_0_0,
-                          DexVm.Version.V10_0_0,
-                          DexVm.Version.V12_0_0,
-                          DexVm.Version.DEFAULT))))
+              TestCondition.match(
+                  compilers(
+                      CompilerUnderTest.R8,
+                      CompilerUnderTest.D8_AFTER_R8CF,
+                      CompilerUnderTest.R8_AFTER_D8),
+                  TestCondition.runtimes(DexVm.Version.V10_0_0, DexVm.Version.V12_0_0)))
           .put(
               "461-get-reference-vreg",
               TestCondition.match(

src/test/java/com/android/tools/r8/dex/TryCatchRangeOverflowTest.java

diff --git a/src/test/java/com/android/tools/r8/dex/TryCatchRangeOverflowTest.java b/src/test/java/com/android/tools/r8/dex/TryCatchRangeOverflowTest.java
index 6e9d85c..c59fc1c 100644
--- a/src/test/java/com/android/tools/r8/dex/TryCatchRangeOverflowTest.java
+++ b/src/test/java/com/android/tools/r8/dex/TryCatchRangeOverflowTest.java
@@ -20,7 +20,6 @@
 import com.android.tools.r8.ir.code.InstructionListIterator;
 import com.android.tools.r8.ir.code.NumericType;
 import com.android.tools.r8.ir.code.Value;
-import com.android.tools.r8.utils.BooleanUtils;
 import com.android.tools.r8.utils.codeinspector.CodeInspector;
 import com.android.tools.r8.utils.codeinspector.MethodSubject;
 import java.util.Arrays;
@@ -80,10 +79,7 @@
       compile(addCount)
           .run(parameters.getRuntime(), TestClass.class)
           .assertSuccessWithOutputLines("" + addCount)
-          .inspect(
-              inspector ->
-                  checkTryCatchHandlers(
-                      1 + BooleanUtils.intValue(addCount > UNSPLIT_LIMIT + 1), inspector));
+          .inspect(inspector -> checkTryCatchHandlers(2, inspector));
     }
   }
 
@@ -115,7 +111,7 @@
     compile(addCount)
         .run(parameters.getRuntime(), TestClass.class)
         .assertSuccessWithOutputLines("" + addCount)
-        .inspect(inspector -> checkTryCatchHandlers(2, inspector));
+        .inspect(inspector -> checkTryCatchHandlers(3, inspector));
   }
 
   private D8TestBuilder compile(int addCount) {