8294974: Convert jdk.jshell/jdk.jshell.execution.LocalExecutionControl to use the Classfile API to instrument classes #11413

asotona · 2022-11-29T12:27:15Z

8294974: jdk.jshell jdk.jshell.execution.LocalExecutionControl uses ASM to instrument classes
This patch converts it to use Classfile API.

Please review.
Thanks,
Adam

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-8294974: Convert jdk.jshell/jdk.jshell.execution.LocalExecutionControl to use the Classfile API to instrument classes

Reviewers

Jan Lahoda (@lahodaj - Reviewer) ⚠️ Review applies to 070be0a8

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11413

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/11413.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

…added test

openjdk-notifier · 2023-03-09T15:29:37Z

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8294974
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

openjdk · 2023-03-09T15:32:41Z

⚠️ @asotona This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

mlbridge · 2023-03-09T17:41:25Z

Webrevs

lahodaj

Looks good to me, with a nit in java.base's module-info.

src/java.base/share/classes/module-info.java

openjdk · 2023-03-10T13:00:43Z

@asotona This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8294974: Convert jdk.jshell/jdk.jshell.execution.LocalExecutionControl to use the Classfile API to instrument classes

Reviewed-by: jlahoda

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

# Conflicts: # src/java.base/share/classes/module-info.java

asotona · 2023-03-13T15:50:49Z

/integrate

openjdk · 2023-03-13T15:53:11Z

Going to push as commit a95bc7a.
Since your change was applied there have been 6 commits pushed to the master branch:

f835aaa: 8300727: java/awt/List/ListGarbageCollectionTest/AwtListGarbageCollectionTest.java failed with "List wasn't garbage collected"
466ffeb: 8303965: java.net.http.HttpClient should reset the stream if response headers contain malformed header fields
431e702: 8303213: Avoid AtomicReference in TextComponentPrintable
4cf4c59: 8303824: Parallel: Use more strict card table API
8e41bf2: 8303238: Create generalizations for existing LShift ideal transforms
805a4e6: 8303883: Confusing parameter name in G1UpdateRemSetTrackingBeforeRebuild::distribute_marked_bytes

Your commit was automatically rebased without conflicts.

openjdk · 2023-03-13T15:53:28Z

@asotona Pushed as commit a95bc7a.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

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 7 commits March 7, 2023 17:14

fixed new lines at end of file

f14287d

Merge branch 'master' into JDK-8294982

4680572

fixed CodeBuilder:constantInstruction for -0.0d and -0.0f values and …

65a6913

…added test

EntryMap::nextPowerOfTwo delegates to Long:numberOfLeadingZeros

b49aae8

minor fix in CodeBuilder and added test cases to LDCTest

cd4a01c

removed obsolete javadoc from implementation classes

385cb26

Merge branch 'JDK-8294982' into JDK-8294974

3c080b1

openjdk-notifier bot changed the base branch from pr/10982 to master March 9, 2023 15:29

Merge branch 'master' into JDK-8294974-jshell

cfcfb07

asotona marked this pull request as ready for review March 9, 2023 17:35

openjdk bot added the rfr Pull request is ready for review label Mar 9, 2023

asotona added 2 commits March 10, 2023 09:47

Merge branch 'master' into JDK-8294974-jshell

f9fb899

Merge branch 'master' into JDK-8294974-jshell

070be0a

lahodaj approved these changes Mar 10, 2023

View reviewed changes

src/java.base/share/classes/module-info.java Outdated Show resolved Hide resolved

openjdk bot added the ready Pull request is ready to be integrated label Mar 10, 2023

fixed empty line

f5ce307

asotona changed the title ~~8294974: jdk.jshell jdk.jshell.execution.LocalExecutionControl uses ASM to instrument classes~~ 8294974: Convert jdk.jshell/jdk.jshell.execution.LocalExecutionControl to use the Classfile API to instrument classes Mar 10, 2023

asotona added 2 commits March 13, 2023 11:28

Merge branch 'master' into JDK-8294974

8e9c6bd

# Conflicts: # src/java.base/share/classes/module-info.java

increased jtreg maxOutputSize for Classfile API tests

9ddfefb

openjdk bot added the integrated Pull request has been integrated label Mar 13, 2023

openjdk bot closed this Mar 13, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 13, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8294974: Convert jdk.jshell/jdk.jshell.execution.LocalExecutionControl to use the Classfile API to instrument classes #11413

8294974: Convert jdk.jshell/jdk.jshell.execution.LocalExecutionControl to use the Classfile API to instrument classes #11413

asotona commented Nov 29, 2022 •

edited by openjdk bot

openjdk-notifier bot commented Mar 9, 2023

openjdk bot commented Mar 9, 2023

mlbridge bot commented Mar 9, 2023 •

edited

lahodaj left a comment

openjdk bot commented Mar 10, 2023 •

edited

asotona commented Mar 13, 2023

openjdk bot commented Mar 13, 2023

openjdk bot commented Mar 13, 2023

8294974: Convert jdk.jshell/jdk.jshell.execution.LocalExecutionControl to use the Classfile API to instrument classes #11413

8294974: Convert jdk.jshell/jdk.jshell.execution.LocalExecutionControl to use the Classfile API to instrument classes #11413

Conversation

asotona commented Nov 29, 2022 • edited by openjdk bot

Progress

Issue

Reviewers

Reviewing

openjdk-notifier bot commented Mar 9, 2023

openjdk bot commented Mar 9, 2023

mlbridge bot commented Mar 9, 2023 • edited

Webrevs

lahodaj left a comment

Choose a reason for hiding this comment

openjdk bot commented Mar 10, 2023 • edited

asotona commented Mar 13, 2023

openjdk bot commented Mar 13, 2023

openjdk bot commented Mar 13, 2023

asotona commented Nov 29, 2022 •

edited by openjdk bot

mlbridge bot commented Mar 9, 2023 •

edited

openjdk bot commented Mar 10, 2023 •

edited