commit 213a41f672875b9721697a75c371be75e515bf6f
author clementbera <clementbera@google.com> Wed May 08 15:43:58 2019 +0200
committer clementbera <clementbera@google.com> Wed May 08 15:43:58 2019 +0200
tree c8d4b111537920004388db058bcb75a3ae032230
parent 94a356535d119d4671bf2431e478347dddd0207c

clean-up Nest access control

Follow-up of 38123 merged

Bug: 132147083
Change-Id: I0ed9f0458302395a24066f11e1095477496af853

src/main/java/com/android/tools/r8/graph/JarClassFileReader.java

diff --git a/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java b/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java
index 8424d3a..df420b0 100644
--- a/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java
+++ b/src/main/java/com/android/tools/r8/graph/JarClassFileReader.java
@@ -484,6 +484,10 @@
     private int getMinorVersion() {
       return ((version >> 16) & 0xFFFF);
     }
+
+    public boolean isInANest() {
+      return !nestMembers.isEmpty() || nestHost != null;
+    }
   }
 
   private static DexAnnotationSet createAnnotationSet(
@@ -731,9 +735,10 @@
 
     private boolean classRequiresCode() {
       return parent.classKind == ClassKind.PROGRAM
-          || parent.application.options.enableNestBasedAccessDesugaring
+          || (parent.application.options.enableNestBasedAccessDesugaring
+              && !parent.application.options.canUseNestBasedAccess()
               && parent.classKind == ClassKind.CLASSPATH
-              && (!parent.nestMembers.isEmpty() || parent.nestHost != null);
+              && parent.isInANest());
     }
 
     @Override