Only optimize instance fields in <init> and static fields in <clinit>
Change-Id: I0a769ac4dbe1fddf4ffd3243e8da8baa5173f51c
diff --git a/src/main/java/com/android/tools/r8/ir/analysis/fieldvalueanalysis/FieldValueAnalysis.java b/src/main/java/com/android/tools/r8/ir/analysis/fieldvalueanalysis/FieldValueAnalysis.java
index 388df3c..b442e7f 100644
--- a/src/main/java/com/android/tools/r8/ir/analysis/fieldvalueanalysis/FieldValueAnalysis.java
+++ b/src/main/java/com/android/tools/r8/ir/analysis/fieldvalueanalysis/FieldValueAnalysis.java
@@ -125,6 +125,7 @@
DexEncodedField encodedField = appInfo.resolveField(field);
if (encodedField != null
&& encodedField.field.holder == context
+ && encodedField.isStatic() == method.isStatic()
&& appInfo.isFieldOnlyWrittenInMethod(encodedField, method)) {
putsPerField.computeIfAbsent(encodedField, ignore -> new LinkedList<>()).add(fieldPut);
}
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StaticFieldAssignedOnlyInInstanceConstructorTest.java b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StaticFieldAssignedOnlyInInstanceConstructorTest.java
new file mode 100644
index 0000000..6b69ae8
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/ir/optimize/membervaluepropagation/StaticFieldAssignedOnlyInInstanceConstructorTest.java
@@ -0,0 +1,53 @@
+// Copyright (c) 2020, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.ir.optimize.membervaluepropagation;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class StaticFieldAssignedOnlyInInstanceConstructorTest extends TestBase {
+
+ private final TestParameters parameters;
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection params() {
+ return getTestParameters().withAllRuntimesAndApiLevels().build();
+ }
+
+ public StaticFieldAssignedOnlyInInstanceConstructorTest(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void test() throws Exception {
+ testForR8(parameters.getBackend())
+ .addInnerClasses(StaticFieldAssignedOnlyInInstanceConstructorTest.class)
+ .addKeepMainRule(TestClass.class)
+ .setMinApi(parameters.getApiLevel())
+ .compile()
+ .run(parameters.getRuntime(), TestClass.class)
+ .assertSuccessWithOutputLines("0");
+ }
+
+ static class TestClass {
+
+ static int FIELD;
+
+ public static void main(String[] args) {
+ System.out.println(FIELD); // Should print 0.
+ new TestClass();
+ }
+
+ public TestClass() {
+ FIELD = 42;
+ }
+ }
+}
