commit 882312f7d49f761b947b2bd15ab628c996c9bf08
author Morten Krogh-Jespersen <mkroghj@google.com> Wed May 12 12:15:33 2021 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed May 12 12:15:33 2021 +0200
tree 0a330b335aca32d623fcee55ba03f48972afbf14
parent f49cd0db626ff32e8db0bfcd83438928d124bfc7

Only assert puts to final fields outside initializers when testing

Fixed: 187905573
Change-Id: I791496a3dee9cff1fb7c017b49d06fd88ad4bb58

src/main/java/com/android/tools/r8/graph/AppView.java

diff --git a/src/main/java/com/android/tools/r8/graph/AppView.java b/src/main/java/com/android/tools/r8/graph/AppView.java
index 2067ad6..bf21997 100644
--- a/src/main/java/com/android/tools/r8/graph/AppView.java
+++ b/src/main/java/com/android/tools/r8/graph/AppView.java
@@ -49,6 +49,7 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 public class AppView<T extends AppInfo> implements DexDefinitionSupplier, LibraryModeledPredicate {
 
@@ -729,4 +730,8 @@
     assert alreadyLibraryDesugared != null;
     return alreadyLibraryDesugared.contains(clazz.getType());
   }
+
+  public boolean checkForTesting(Supplier<Boolean> test) {
+    return testing().enableTestAssertions ? test.get() : true;
+  }
 }

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadElimination.java b/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadElimination.java
index 989c188..7092012 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadElimination.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/RedundantFieldLoadElimination.java
@@ -244,8 +244,10 @@
               killNonFinalActiveFields(staticPut);
               ExistingValue value = new ExistingValue(staticPut.value());
               if (isFinal(field)) {
-                assert !field.getDefinition().isFinal()
-                    || method.getDefinition().isClassInitializer();
+                assert appView.checkForTesting(
+                    () ->
+                        !field.getDefinition().isFinal()
+                            || method.getDefinition().isClassInitializer());
                 activeState.putFinalStaticField(reference, value);
               } else {
                 activeState.putNonFinalStaticField(reference, value);