commit 14f2e9e69245a2fd031a5c4000ff167afdbdaae9
author Christoffer Quist Adamsen <christofferqa@google.com> Wed May 06 11:52:32 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed May 06 11:52:32 2020 +0200
tree 5b8eadd6be3a37cfcf51c94056e24013f7b009b7
parent 044b4a5fdb17af045c7cf5610ca1c1747e110658

Revert semantic change to class inliner analysis from field resolution changes

Change-Id: Ic864b19d7397f5bf7b142582b2fb3a0e10fa3d41

src/main/java/com/android/tools/r8/ir/optimize/info/MethodOptimizationInfoCollector.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/info/MethodOptimizationInfoCollector.java b/src/main/java/com/android/tools/r8/ir/optimize/info/MethodOptimizationInfoCollector.java
index 08a548c..2464952 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/info/MethodOptimizationInfoCollector.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/info/MethodOptimizationInfoCollector.java
@@ -224,7 +224,7 @@
               }
             }
             DexField field = insn.asFieldInstruction().getField();
-            if (appView.appInfo().resolveFieldOn(clazz, field) != null) {
+            if (appView.appInfo().resolveFieldOn(clazz, field).isSuccessfulResolution()) {
               // Require only accessing direct or indirect instance fields of the current class.
               break;
             }