commit 148ece56e8d4b0de5b447715f48ebc385abdaf65
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Jan 15 10:41:37 2020 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Jan 15 10:41:37 2020 +0100
tree 51fbe1820f339803c333bbe842e72c21e23ac56b
parent 27b291ec6b1f35d46e380b326c7e297076b36875

Only record effectively final field information for static fields

Change-Id: Ie46d5ed607d338932d3fffe697e821da57b9757c

src/main/java/com/android/tools/r8/ir/analysis/fieldvalueanalysis/FieldValueAnalysis.java

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 9fcba84..7b861b2 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
@@ -278,12 +278,14 @@
     // Abstract value.
     Value root = value.getAliasedValue();
     AbstractValue abstractValue = computeAbstractValue(root);
-    feedback.recordFieldHasAbstractValue(
-        field,
-        appView,
-        abstractValue.isUnknown()
-            ? appView.abstractValueFactory().createSingleFieldValue(field.field)
-            : abstractValue);
+    if (abstractValue.isUnknown()) {
+      if (field.isStatic()) {
+        feedback.recordFieldHasAbstractValue(
+            field, appView, appView.abstractValueFactory().createSingleFieldValue(field.field));
+      }
+    } else {
+      feedback.recordFieldHasAbstractValue(field, appView, abstractValue);
+    }
 
     // Dynamic upper bound type.
     TypeLatticeElement fieldType =