commit 4070cb0a52e952d1aeab12ad809fd3d59049deec
author Ian Zerny <zerny@google.com> Tue Jan 07 07:50:16 2020 +0100
committer Ian Zerny <zerny@google.com> Tue Jan 07 07:50:16 2020 +0100
tree d10689d1eee55d7838408c3df450ec116b010a07
parent 6312f42b950b6e26b281c7b201f662371fc82b73

Determine access through the initial resolution holder.

Change-Id: Ibaf4c508f46b8886550a67bfffbfe2062d6f4859

src/main/java/com/android/tools/r8/shaking/Enqueuer.java

diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index 2e2216e..ac1dea1 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -1999,7 +1999,7 @@
     if (contextOrNull != null
         && !resolution.isUnresolved()
         && !AccessControl.isMethodAccessible(
-            resolution.method, resolution.holder, contextOrNull.holder, appInfo)) {
+            resolution.method, holder, contextOrNull.holder, appInfo)) {
       // Not accessible from this context, so this call will cause a runtime exception.
       // Note that the resolution is not cached, as another call context may be valid.
       return;