8294960: Convert java.base/java.lang.invoke package to use the Classfile API to generate lambdas and method handlers #12945

asotona · 2023-03-09T11:38:12Z

java.base java.lang.invoke package heavily uses ASM to generate lambdas and method handlers

This patch converts ASM calls to Classfile API.
This PR is initially chained on 8294982: Implementation of Classfile API #10982

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue

Issue

JDK-8294960: Convert java.base/java.lang.invoke package to use the Classfile API to generate lambdas and method handlers (Sub-task - P4)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/12945/head:pull/12945
$ git checkout pull/12945

Update a local copy of the PR:
$ git checkout pull/12945
$ git pull https://git.openjdk.org/jdk.git pull/12945/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12945

View PR using the GUI difftool:
$ git pr show -t 12945

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12945.diff

…e and added test (openjdk#11)

…lang.reflect.AccesFlag in Classfile API and tests

…andleInfo implemented RebuildingTransformation and added to Transforms and CorpusTest reduced CorpusTestHelper output and adjusted TEST.properties

MethodParameterInfo name parameter changed to Optional added MethodParameterInfo::ofParameter(Optional<String>,int) implemented TemporaryConstantPool::stringEntry adjusted BoundAttribute and RebuildingTransformation test helper

EnclosingMethodAttribute factory method changed to accept Optionals added EnclosingMethodAttribute::of(ClassDesc,Optional<String>,Optional<MethodTypeDesc>) added EnclosingMethodAttribute accessor methods InnerClassInfo all factory methods changed to accept Optionals added NestHostAttribute::of(ClassDesc) added SourceIDAttribute::of(String) changes reflected in BoundAttribute and RebuildTransformation test helper

* added TypeAnnotation factory methods accepting ClassDesc and AnnotationElement... AnnotationValue.OfConstant sub-classed to allow switch pattern matching RebuildingTransformation test helper adjusted * added TypeAnnotation.TargetInfo factory methods with validity checking for multi-target types adjusted RebuildTransformation test helper

…Symbol (openjdk#13) refactored to FieldModel::fieldTypeSymbol and MethodModel::methodTypeSymbol (openjdk#13) added round testing of signatures in RebuildTransformation test helper

… a frame type. Doing so, make the chop size available to consumers of frames.

…eInstructions

…ptor argument slots

…ine-tunning

asotona · 2023-06-08T12:22:16Z

@liach thank you for the review

…java Co-authored-by: liach <7806504+liach@users.noreply.github.com>

bridgekeeper · 2023-08-03T18:51:46Z

@asotona This pull request has been inactive for more than 8 weeks and will be automatically closed if another 8 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

ExE-Boss

See: #12945 (review)

src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java

openjdk · 2023-09-21T19:02:10Z

@asotona this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8294960-lambdas
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

liach · 2023-09-22T01:31:39Z

src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java

-            }
-            return cw.toByteArray();
+            return Classfile.of().build(ClassDesc.of("InjectedInvoker"), clb -> clb
+                    .withFlags(Classfile.ACC_PRIVATE | Classfile.ACC_SUPER)


Don't think ACC_PRIVATE works for classes; ASM might have a workaround to apply this onto an InnerClasses attribute, but we cannot modify the outer class to inject attributes so only adding this to inner class's InnerClasses is meaningless.

# Conflicts: # src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java # src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java

src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java

src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java

…sHelper.java Co-authored-by: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>

…java Co-authored-by: liach <7806504+liach@users.noreply.github.com>

…nerator.java Co-authored-by: liach <7806504+liach@users.noreply.github.com>

bridgekeeper · 2023-11-22T20:00:27Z

@asotona This pull request has been inactive for more than 8 weeks and will be automatically closed if another 8 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

asotona · 2023-12-14T12:38:16Z

Unfortunately this PR went far out of the sync to merge or rebase, so I have to close it and start a new PR with squashed and rebased changes from this one.

asotona · 2023-12-14T12:41:23Z

Work on java.lang.invoke package conversion continues in #17108

asotona and others added 30 commits June 10, 2022 14:20

Initial commit of Classfile Processing API

34c6057

fix of javadoc link

6663f05

fixed ClassPrinterTest on Windows

63d0e3b

Update README.md

02bf8b4

fixed dead code patching in StackMapGenerator::removeRangeFromExcTabl…

e1386df

…e and added test (openjdk#11)

Tweak JEP link

0daac4a

Merge master branch into classfile-api-branch

a5a2580

removal of jdk.classfile.jdktypes.AccessFlag and redirection to java.…

b5267ad

…lang.reflect.AccesFlag in Classfile API and tests

Classfile API javadoc build fix

941dfb0

fixed InvokeDynamicEntry::asSymbol and BytecodeHelpers::handleDescToH…

0fe61c5

…andleInfo implemented RebuildingTransformation and added to Transforms and CorpusTest reduced CorpusTestHelper output and adjusted TEST.properties

added ConstantValueAttribute::of(ConstantDesc)

a89d822

MethodParameterInfo name parameter changed to Optional added MethodParameterInfo::ofParameter(Optional<String>,int) implemented TemporaryConstantPool::stringEntry adjusted BoundAttribute and RebuildingTransformation test helper

refactored to FieldModel::fieldTypeSymbol and MethodModel::methodType…

d8f30a7

…Symbol (openjdk#13) refactored to FieldModel::fieldTypeSymbol and MethodModel::methodTypeSymbol (openjdk#13) added round testing of signatures in RebuildTransformation test helper

Model stack map frames in a type hierarchy where each type represents…

59479ff

… a frame type. Doing so, make the chop size available to consumers of frames.

Merge branch 'master' into classfile-api-branch

28f560e

Added some testing of local variable management, with BlockBuilder

99a17b3

test/jdk/jdk/classfile/examples fixed

f2ac770

Fixed frame offset valid boundaries in StackMapGenerator + added test

8480163

Adds toString methods to all classes that appear within a CodeModel.

ace0f43

Update README.md

a98f860

new JMH micro benchmark focused on clean StackMapGenerator throughput

4b69c9c

PerformancePatch - avoid ArrayList in StackMapGenerator::processInvok…

0631349

…eInstructions

StackMapGenerator code cleanup

1950b1f

PerformancePatch - StackMapGenerator faster counting of method descri…

e14f3a5

…ptor argument slots

PerformancePatch - StackMapGenerator more effective loops and other f…

5cbe442

…ine-tunning

CodeBuilder and ClassPrinterImpl minor fixes

a1502e3

update of AdvancedTransformationsTest::instrument

4b5620e

CodeBuilder fixes and increased test coverage

0c80bff

Classfile try catch

4c730ed

asotona added 5 commits June 7, 2023 17:51

removed emitReturnInsn

121f084

InvokerBytecodeGenerator fixes

57b3dfc

InvokerBytecodeGenerator fixes

44045d4

Merge branch 'master' into JDK-8294960-lambdas

51a112a

recommended changes

c24aeb8

asotona and others added 4 commits June 8, 2023 14:23

Update src/java.base/share/classes/java/lang/invoke/ClassSpecializer.…

40a6ad8

…java Co-authored-by: liach <7806504+liach@users.noreply.github.com>

applied recommended changes

f3b1499

Merge branch 'master' into JDK-8294960-lambdas

3b917a8

fixed use of Classfile

cbc0c44

ExE-Boss reviewed Aug 19, 2023

View reviewed changes

src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java Outdated Show resolved Hide resolved

src/java.base/share/classes/java/lang/invoke/GenerateJLIClassesHelper.java Outdated Show resolved Hide resolved

openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Sep 21, 2023

liach reviewed Sep 22, 2023

View reviewed changes

Merge branch 'master' into JDK-8294960-lambdas

3adafc7

# Conflicts: # src/java.base/share/classes/java/lang/invoke/ClassSpecializer.java # src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java

openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Sep 26, 2023

liach reviewed Sep 26, 2023

View reviewed changes

asotona and others added 7 commits September 27, 2023 11:10

Update src/java.base/share/classes/java/lang/invoke/GenerateJLIClasse…

4118f7e

…sHelper.java Co-authored-by: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>

Update src/java.base/share/classes/java/lang/invoke/GenerateJLIClasse…

c9abd03

…sHelper.java Co-authored-by: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>

Update src/java.base/share/classes/java/lang/invoke/ClassSpecializer.…

2e6fe39

…java Co-authored-by: liach <7806504+liach@users.noreply.github.com>

Update src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGe…

1530396

…nerator.java Co-authored-by: liach <7806504+liach@users.noreply.github.com>

applied review suggestions

afe59c9

applied review suggestions

f23a8f8

applied review suggestions

84111ec

asotona closed this Dec 14, 2023

asotona mentioned this pull request Dec 14, 2023

8294960: Convert java.base/java.lang.invoke package to use the Classfile API to generate lambdas and method handles #17108

Open

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8294960: Convert java.base/java.lang.invoke package to use the Classfile API to generate lambdas and method handlers #12945

8294960: Convert java.base/java.lang.invoke package to use the Classfile API to generate lambdas and method handlers #12945

asotona commented Mar 9, 2023 •

edited by openjdk bot

asotona commented Jun 8, 2023

bridgekeeper bot commented Aug 3, 2023

ExE-Boss left a comment

openjdk bot commented Sep 21, 2023

liach Sep 22, 2023

bridgekeeper bot commented Nov 22, 2023

asotona commented Dec 14, 2023 •

edited

asotona commented Dec 14, 2023

8294960: Convert java.base/java.lang.invoke package to use the Classfile API to generate lambdas and method handlers #12945

8294960: Convert java.base/java.lang.invoke package to use the Classfile API to generate lambdas and method handlers #12945

Conversation

asotona commented Mar 9, 2023 • edited by openjdk bot

Progress

Issue

Reviewing

asotona commented Jun 8, 2023

bridgekeeper bot commented Aug 3, 2023

ExE-Boss left a comment

Choose a reason for hiding this comment

openjdk bot commented Sep 21, 2023

liach Sep 22, 2023

Choose a reason for hiding this comment

bridgekeeper bot commented Nov 22, 2023

asotona commented Dec 14, 2023 • edited

asotona commented Dec 14, 2023

asotona commented Mar 9, 2023 •

edited by openjdk bot

asotona commented Dec 14, 2023 •

edited