commit 89fc839229ebaec879b71103220ef191beba9b95
author Rico Wind <ricow@google.com> Tue May 28 13:26:46 2024 +0200
committer Rico Wind <ricow@google.com> Tue May 28 11:27:57 2024 +0000
tree 3c8766c01713b00b4c85c72e79a1cbafff9e728a
parent 7ff131f9cd0452e49ec53d011ba83bbd75f7d470

Fix wrong edit from last commit

Added a debug change in https://r8-review.git.corp.google.com/c/r8/+/92528

Change-Id: I03eee9ab218d3a815c89416e737029b29bb56541

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/ClassInitializerDefaultsOptimization.java b/src/main/java/com/android/tools/r8/ir/optimize/ClassInitializerDefaultsOptimization.java
index 535b4bf..afaf0c7 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/ClassInitializerDefaultsOptimization.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/ClassInitializerDefaultsOptimization.java
@@ -442,7 +442,7 @@
                     isWrittenBefore.remove(fieldReference);
                   }
                   continue;
-                } else if ((fieldReference.type.isPrimitiveType())
+                } else if ((fieldReference.type.isPrimitiveType() && !hasPutOfConstResource(put))
                     || fieldReference.type == dexItemFactory.stringType) {
                   finalFieldPuts.put(field, put);
                   unnecessaryStaticPuts.add(put);