Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8310848: Convert ClassDesc and MethodTypeDesc to be stored in static final fields #14640

Closed
wants to merge 6 commits into from

Conversation

liach
Copy link
Member

@liach liach commented Jun 25, 2023

This would encourage Classfile API users to use the descriptors as constants, which can improve performance by avoiding repeated validation and reusing cached descriptor strings for MethodTypeDesc. This patch updates usages in the main codebase and benchmarks; tests are left untouched.

See https://mail.openjdk.org/pipermail/classfile-api-dev/2023-June/000378.html


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-8310848: Convert ClassDesc and MethodTypeDesc to be stored in static final fields (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14640

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 25, 2023

👋 Welcome back liach! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 25, 2023
@openjdk
Copy link

openjdk bot commented Jun 25, 2023

@liach The following labels will be automatically applied to this pull request:

  • core-libs
  • kulla

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added core-libs core-libs-dev@openjdk.org kulla kulla-dev@openjdk.org labels Jun 25, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 25, 2023

Webrevs

@liach
Copy link
Member Author

liach commented Jun 28, 2023

@asotona Can you review this patch that migrates MethodTypeDesc creation to static final field access whenever possible? This allows to reuse cached descriptor strings and avoid revalidation. In addition, I dropped the jdkTreePrimitive benchmark for jdk.classfile.Write, which is identical to jdkTree as far as I see.

@asotona
Copy link
Member

asotona commented Jun 28, 2023

This code replacing repeated symbols instantiation with static fields looks good.

However the patch also contains significant refactoring of jdk.jlink SystemModulesPlugin
and significant refactoring of the JMH benchmarks Write class.

I suggest to split this PR or link additional issues to it.

There is missing description of the problems so the proposed solution cannot be reviewed.

@liach
Copy link
Member Author

liach commented Jun 28, 2023

I have reverted the changes to SystemModulesPlugin and Write. Can you review this patch again?

Copy link
Member

@asotona asotona left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks good 👍

@openjdk
Copy link

openjdk bot commented Jun 28, 2023

@liach 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:

8310848: Convert ClassDesc and MethodTypeDesc to be stored in static final fields

Reviewed-by: asotona

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 21 new commits pushed to the master branch:

  • 6f58ab2: 8301569: jmod list option and jimage list --help not interpreted correctly on turkish locale
  • 8f5a384: 8311032: Empty value for java.protocol.handler.pkgs system property can lead to unnecessary classloading attempts of protocol handlers
  • ded1370: 8309811: BytecodePrinter cannot handle unlinked classes
  • 02b17d7: 8310264: In PhaseChaitin::Split defs and phis are leaked
  • a63afa4: 8294427: Check boxes and radio buttons have rendering issues on Windows in High DPI env
  • 3df36c4: 8310061: Note if implicit annotation processing is being used
  • da0f832: 8310606: Fix signed integer overflow, part 3
  • f0c2f09: 8296972: [macos13] java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java: getExtendedState() != 6 as expected.
  • 9f46fc2: 8310906: Fix -Wconversion warnings in runtime, oops and some code header files.
  • 7fffdb5: 8310405: Linker.Option.firstVariadicArg should specify which index values are valid
  • ... and 11 more: https://git.openjdk.org/jdk/compare/526dba1a2942e444bf11d03d8eaf014b5ef20ccf...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@asotona) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 28, 2023
@liach
Copy link
Member Author

liach commented Jun 29, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 29, 2023
@openjdk
Copy link

openjdk bot commented Jun 29, 2023

@liach
Your change (at version f33d1f6) is now ready to be sponsored by a Committer.

@asotona
Copy link
Member

asotona commented Jun 29, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 29, 2023

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

  • e5744b8: 8310919: runtime/ErrorHandling/TestAbortVmOnException.java times out due to core dumps taking a long time on OSX
  • 98a954e: 8308286: Fix clang warnings in linux code
  • f842ec4: 8305667: Some fonts installed in user directory are not detected on Windows
  • 690d626: 8307927: C2: "malformed control flow" with irreducible loop
  • be64d3a: 8310299: C2: 8275201 broke constant folding of array store check in some cases
  • b2eae16: 8295191: IR framework timeout options expect ms instead of s
  • af319d9: 8311064: Windows builds fail without precompiled headers after JDK-8310728
  • cbf418a: 8311020: Typo cleanup in Classfile API
  • f4b900b: 8310902: (fc) FileChannel.transferXXX async close and interrupt issues
  • cf8d706: 8308463: Refactor regenerated class handling in lambdaFormInvokers.cpp
  • ... and 21 more: https://git.openjdk.org/jdk/compare/526dba1a2942e444bf11d03d8eaf014b5ef20ccf...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 29, 2023
@openjdk openjdk bot closed this Jun 29, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jun 29, 2023
@openjdk
Copy link

openjdk bot commented Jun 29, 2023

@asotona @liach Pushed as commit 07734f6.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated kulla kulla-dev@openjdk.org
2 participants