commit ab1da228c1f39437e0617c5aef42e63f63d3cd50
author Christoffer Quist Adamsen <christofferqa@google.com> Sat Sep 12 15:30:02 2020 +0000
committer Christoffer Quist Adamsen <christofferqa@google.com> Sat Sep 12 15:30:14 2020 +0000
tree f4b38fa75d540a85c2bc39d16fb4af360a6d7b9d
parent 1fbe3b46ea9308102a216280b9d30f0f4e9d8047

Revert "Fix redundant field load elimination invoke direct field put"

This reverts commit 5919fefdaba37ac6f05631df737961f80d1a6089.

Reason for revert: Bot failures

Change-Id: I4805f6dd1d4f3e1c537d672d9af48b0763af2149

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 ae47cc2..eb6bddd 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
@@ -372,22 +372,13 @@
                 invoke.getArgument(info.asArgumentInitializationInfo().getArgumentIndex());
             Value object = invoke.getReceiver().getAliasedValue();
             FieldAndObject fieldAndObject = new FieldAndObject(field.field, object);
-            if (field.isFinal()) {
-              activeState.putFinalInstanceField(fieldAndObject, new ExistingValue(value));
-            } else {
-              activeState.putNonFinalInstanceField(fieldAndObject, new ExistingValue(value));
-            }
+            activeState.putNonFinalInstanceField(fieldAndObject, new ExistingValue(value));
           } else if (info.isSingleValue()) {
             SingleValue value = info.asSingleValue();
             if (value.isMaterializableInContext(appView.withLiveness(), method)) {
               Value object = invoke.getReceiver().getAliasedValue();
               FieldAndObject fieldAndObject = new FieldAndObject(field.field, object);
-              if (field.isFinal()) {
-                activeState.putFinalInstanceField(fieldAndObject, new MaterializableValue(value));
-              } else {
-                activeState.putNonFinalInstanceField(
-                    fieldAndObject, new MaterializableValue(value));
-              }
+              activeState.putNonFinalInstanceField(fieldAndObject, new MaterializableValue(value));
             }
           } else {
             assert info.isTypeInitializationInfo();