commit 1fcb98ecd1c371fb91676ba6dc788057b587d143
author Christoffer Adamsen <christofferqa@google.com> Fri Oct 03 14:05:24 2025 +0200
committer Christoffer Adamsen <christofferqa@google.com> Mon Oct 06 23:55:28 2025 -0700
tree 74ebb9658850f2dfead7a101e26d96355d9dc638
parent c0f07726d731d2f39ac23602c97e97d9a3f3d94c

Enable storeStoreFence constructor inlining by default

Change-Id: Ia8a895045c1d1c2a6ac0ef0a67a3ea7d32496522

src/main/java/com/android/tools/r8/utils/InternalOptions.java

diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 8fadcd8..81cc3e0 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -1849,7 +1849,7 @@
     public boolean enableConstructorInlining = true;
     public boolean enableConstructorInliningWithFinalFields =
         parseSystemPropertyOrDefault(
-            "com.android.tools.r8.enableConstructorInliningWithFinalFields", false);
+            "com.android.tools.r8.enableConstructorInliningWithFinalFields", true);
     public boolean skipStoreStoreFenceInConstructorInlining =
         parseSystemPropertyOrDefault(
             "com.android.tools.r8.skipStoreStoreFenceInConstructorInlining", false);

src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java

diff --git a/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java b/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java
index 35ab038..498014e 100644
--- a/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java
+++ b/src/test/testbase/java/com/android/tools/r8/TestCompilerBuilder.java
@@ -76,7 +76,6 @@
             options.testing.forcePruneMetaInfManifestMf = true;
             options.horizontalClassMergerOptions().enable();
             options.horizontalClassMergerOptions().setEnableInterfaceMerging();
-            options.inlinerOptions().enableConstructorInliningWithFinalFields = true;
             options
                 .getCfCodeAnalysisOptions()
                 .setAllowUnreachableCfBlocks(false)