Desugaring of Nest-based Access Control [130529338]

Fixed

Feature Request

Status Update

No update yet.

Description

sg...@google.com

created issue #1

Apr 15, 2019 11:19AM

Specification for JEP 181: Nest-based Access Control:

https://cr.openjdk.java.net/~dlsmith/nestmates.html

This is implemented from JDK 11, where javac will generate the new attributes and not accessibility bridges.

Comments

ap...@google.com <ap...@google.com> #2Apr 15, 2019 04:33PM

Project: r8
Branch: master

commit 6c91c653090772ac86b9e72c9f36e272f1cece46
Author: clementbera <clementbera@google.com>
Date: Mon Apr 15 17:28:42 2019

Switched compatibility to ASM7

Lots of files used ASM in ASM6 compatibility, I switched to ASM7.
I introduced an ASM_VERSION internal option which I set to ASM7 and
replaced most references to ASM6 constant to ASM_VERSION. In a few
places using ASM_VERSION was introducing new dependencies so
I just used directly the ASM7 constant.

Bug: 130529338
Change-Id: Ie8bbeb36701198dc25fb2307e5467cb2079f315c

M src/main/java/com/android/tools/r8/graph/JarClassFileReader.java
M src/main/java/com/android/tools/r8/graph/JarCode.java
M src/main/java/com/android/tools/r8/graph/LazyCfCode.java
M src/main/java/com/android/tools/r8/jar/CfApplicationWriter.java
M src/main/java/com/android/tools/r8/jar/InliningConstraintVisitor.java
M src/main/java/com/android/tools/r8/jar/JarArgumentUseVisitor.java
M src/main/java/com/android/tools/r8/jar/JarRegisterEffectsVisitor.java
M src/main/java/com/android/tools/r8/utils/InternalOptions.java
M src/test/examplesAndroidO/invokecustom/TestGenerator.java
M src/test/examplesAndroidO/invokecustom2/TestGenerator.java
M src/test/examplesAndroidO/stringconcat/TestGenerator.java
M src/test/examplesAndroidP/invokecustom/TestGenerator.java
M src/test/java/com/android/tools/r8/CfFrontendExamplesTest.java
M src/test/java/com/android/tools/r8/TestBase.java
M src/test/java/com/android/tools/r8/cf/MethodHandleDump.java
M src/test/java/com/android/tools/r8/desugaring/interfacemethods/InterfaceMethodDesugaringTests.java
M src/test/java/com/android/tools/r8/jsr45/JSR45Tests.java
M src/test/java/com/android/tools/r8/kotlin/AsmUtils.java
M src/test/java/com/android/tools/r8/rewrite/assertions/RemoveAssertionsTest.java
M src/test/java/com/android/tools/r8/shaking/examples/InliningClassVersionTest.java

https://r8-review.googlesource.com/37017

ap...@google.com <ap...@google.com> #3Apr 16, 2019 02:07PM

Project: r8
Branch: master

commit d7ab1ddda6202af46e5bb22ca076344686c07508
Author: clementbera <clementbera@google.com>
Date: Tue Apr 16 16:05:00 2019

Add (failing) tests for nest based access control

Tests exhaustively check for each case where a private
member can be accessed from nest mates.

Bug: 130529338
Change-Id: Ia14a8e78079db26585bb4ea5a1ca7b64606dcebd

M build.gradle
A src/test/examplesJava11/nestHostExample/NestHostExample$NestMemberInner$NestMemberInnerInner.class
A src/test/examplesJava11/nestHostExample/NestHostExample$NestMemberInner.class
A src/test/examplesJava11/nestHostExample/NestHostExample$StaticNestInterfaceInner.class
A src/test/examplesJava11/nestHostExample/NestHostExample$StaticNestMemberInner$StaticNestMemberInnerInner.class
A src/test/examplesJava11/nestHostExample/NestHostExample$StaticNestMemberInner.class
A src/test/examplesJava11/nestHostExample/NestHostExample.class
A src/test/examplesJava11/nestHostExample/NestHostExample.java
M src/test/java/com/android/tools/r8/ToolHelper.java
A src/test/java/com/android/tools/r8/desugar/NestAccessControl/NestAccessControlTest.java

https://r8-review.googlesource.com/37101

ap...@google.com <ap...@google.com> #4Apr 23, 2019 11:04AM

Project: r8
Branch: master

commit 0fe940d2f2cb900db27a457841cf92cef7773612
Author: clementbera <clementbera@google.com>
Date: Tue Apr 23 12:45:18 2019

NestBasedAccessControl Anonymous Inner class support

- Added tests for anonymous inner class
- Turns out anonymous inner classes worked out of the box
- Added a simpler test to debug simple cases
- change Nest tests packaging to follow convention
(all in package named nestHostExample instead of no package)
- change Java 11 tests build to avoid committing all class files

Bug: 130529338
Change-Id: Ic69b5aa730c6168e993e5deacf3f1b7b074196b4

M build.gradle
A src/test/examplesJava11/nestHostExample/BasicNestHostWithAnonymousInnerClass.java
A src/test/examplesJava11/nestHostExample/BasicNestHostWithInnerClass.java
D src/test/examplesJava11/nestHostExample/NestHostExample$NestMemberInner$NestMemberInnerInner.class
D src/test/examplesJava11/nestHostExample/NestHostExample$NestMemberInner.class
D src/test/examplesJava11/nestHostExample/NestHostExample$StaticNestInterfaceInner.class
D src/test/examplesJava11/nestHostExample/NestHostExample$StaticNestMemberInner$StaticNestMemberInnerInner.class
D src/test/examplesJava11/nestHostExample/NestHostExample$StaticNestMemberInner.class
D src/test/examplesJava11/nestHostExample/NestHostExample.class
M src/test/examplesJava11/nestHostExample/NestHostExample.java
M src/test/java/com/android/tools/r8/desugar/NestAccessControl/NestAccessControlTest.java
M src/test/java/com/android/tools/r8/desugar/NestAccessControl/NestAttributesTest.java

https://r8-review.googlesource.com/37322

ap...@google.com <ap...@google.com> #5Apr 29, 2019 09:04AM

Project: r8
Branch: master

commit a14f58b526efc2c90740884c90b5d03cbf8c5c43
Author: clementbera <clementbera@google.com>
Date: Mon Apr 29 10:58:16 2019

Improve Nest-based control tests

Add more basic tests for nest based access control,
change tests so that as features are implemented
different parts of the tests can be set to successful.

Bug:130529338
Change-Id: I72b11edccb358e62739dfbaf7f86fd4de3cdf86e

D src/test/examplesJava11/nestHostExample/BasicNestHostWithInnerClass.java
A src/test/examplesJava11/nestHostExample/BasicNestHostWithInnerClassConstructors.java
A src/test/examplesJava11/nestHostExample/BasicNestHostWithInnerClassFields.java
A src/test/examplesJava11/nestHostExample/BasicNestHostWithInnerClassMethods.java
M src/test/java/com/android/tools/r8/desugar/NestAccessControl/NestAccessControlTest.java

https://r8-review.googlesource.com/37722

ap...@google.com <ap...@google.com> #6Apr 29, 2019 05:14PM

Project: r8
Branch: master

commit fc97088d46557198880fd4d7c106ea3d2fc1cf01
Author: clementbera <clementbera@google.com>
Date: Mon Apr 29 16:42:00 2019

Desugaring nest based control private methods

Add support for desugaring of calls to private methods,
static and non-static, in nests.

Bug: 130529338
Change-Id: Ib5455cb9c53082f62b78492dec84b89c56a3dcb8

M src/main/java/com/android/tools/r8/R8.java
M src/main/java/com/android/tools/r8/graph/DexClass.java
M src/main/java/com/android/tools/r8/graph/DexEncodedMethod.java
M src/main/java/com/android/tools/r8/graph/DexItemFactory.java
A src/main/java/com/android/tools/r8/ir/desugar/NestBasedAccessDesugaring.java
A src/main/java/com/android/tools/r8/ir/desugar/NestedPrivateMethodLense.java
M src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
M src/main/java/com/android/tools/r8/utils/InternalOptions.java
M src/test/java/com/android/tools/r8/desugar/NestAccessControl/NestAccessControlTest.java

https://r8-review.googlesource.com/37654

cl...@google.com <cl...@google.com> May 7, 2019 10:30AM

Marked as fixed.

to...@yahoo.com <to...@yahoo.com> #7Jul 29, 2021 03:17PM

broken again when using Artic Fox STABLE first release and JDK 11...

build error: This feature requires ASM7

Message last modified on Jul 29, 2021 03:18PM