commit ac5d0ab5d0f361df2d0f2345e50a96e2796912f8
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Aug 22 12:48:15 2022 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Aug 24 06:29:13 2022 +0000
tree 866400aefce4190538e3b966e6674fa7efc4a91c
parent a2e203580aa00a36f85cd68d3d584b97aef34d59

Check field result when resolving field in inlining constraints

Change-Id: If1415d3a18f1ec7a478b397b318501384c21be2b

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/InliningConstraints.java b/src/main/java/com/android/tools/r8/ir/optimize/InliningConstraints.java
index 6dc28aa..3801d7c 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/InliningConstraints.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/InliningConstraints.java
@@ -351,6 +351,9 @@
   private ConstraintWithTarget forFieldInstruction(DexField field, ProgramMethod context) {
     DexField lookup = graphLens.lookupField(field);
     FieldResolutionResult fieldResolutionResult = appView.appInfo().resolveField(lookup);
+    if (fieldResolutionResult.isMultiFieldResolutionResult()) {
+      return ConstraintWithTarget.NEVER;
+    }
     return forResolvedMember(
         fieldResolutionResult.getInitialResolutionHolder(),
         context,