commit cb3851a0c77b30d696eae065d523b6fede0e2eb2
author Christoffer Adamsen <christofferqa@google.com> Thu Nov 28 10:31:46 2024 +0100
committer Christoffer Adamsen <christofferqa@google.com> Thu Nov 28 10:31:46 2024 +0100
tree 7f843543937c8d9c21be1439a9ea58b5500bf568
parent 0ff3415ebe3965d6ced3759dcf263f12fa2d0ec7

Allow redundant field load elimination for library fields

Fixes: b/381030275
Change-Id: I7f5ec07d05d60eacb7ac7877855d7acce2cda3f5

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

diff --git a/src/main/java/com/android/tools/r8/graph/LibraryField.java b/src/main/java/com/android/tools/r8/graph/LibraryField.java
index 8221f8d..70a19a8 100644
--- a/src/main/java/com/android/tools/r8/graph/LibraryField.java
+++ b/src/main/java/com/android/tools/r8/graph/LibraryField.java
@@ -35,6 +35,7 @@
 
   @Override
   public boolean isFinalOrEffectivelyFinal(AppView<?> appView) {
-    return appView.libraryMethodOptimizer().isFinalLibraryField(getDefinition());
+    return getAccessFlags().isFinal()
+        && getHolderType().isNotIdenticalTo(appView.dexItemFactory().javaLangSystemType);
   }
 }