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

8288443: Simplify vmClasses::resolve_all() #9157

Closed

Conversation

iklam
Copy link
Member

@iklam iklam commented Jun 14, 2022

Please review this simple clean up:

  • There's no need to initialize the JSR 292 classes separately (the -XX:+EnableInvokeDynamic option has been removed long time ago).
  • Separate initialization of the reference classes is not necessary when CDS is enabled.

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9157

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 14, 2022

👋 Welcome back iklam! 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
Copy link

openjdk bot commented Jun 14, 2022

@iklam The following label will be automatically applied to this pull request:

  • hotspot-runtime

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

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jun 14, 2022
@iklam iklam marked this pull request as ready for review June 14, 2022 18:51
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 14, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 14, 2022

Webrevs

Copy link
Member

@calvinccheung calvinccheung left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk
Copy link

openjdk bot commented Jun 14, 2022

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

8288443: Simplify vmClasses::resolve_all()

Reviewed-by: ccheung, dholmes, coleenp

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

  • 9ff4034: 8288530: ProblemList serviceability/jvmti/VMObjectAlloc/VMObjectAllocTest.java in -Xcomp mode
  • 1855e9d: 8220732: setSeed(long) java api doc is missing warning about provided seed quality
  • 6d59561: 8288425: Footprint regression due MH creation when initializing StringConcatFactory
  • 3475e12: 8288330: Avoid redundant ConcurrentHashMap.get call in Http2ClientImpl.deleteConnection
  • cb5ef3d: 8288499: Restore cancel-in-progress in GHA
  • 13d4ddc: 8286962: java/net/httpclient/ServerCloseTest.java failed once with ConnectException
  • 6633855: 8288399: MacOS debug symbol files not always deterministic in reproducible builds
  • d5cd2f2: 8284849: Add deoptimization to unified logging
  • dfeeb6f: 8288140: Avoid redundant Hashtable.get call in Signal.handle
  • 68b2057: 8287373: remove unnecessary paddings in generated code
  • ... and 7 more: https://git.openjdk.org/jdk/compare/fb297705f6dc668bea0257efb9c46b90b5eab2e9...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.

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

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 14, 2022
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Seems fine.

There are related comments about ordering and 1.4 JDKs in vmClassMacros.hpp that should also be cleaned up. I find it interesting it says

/* Note: MethodHandle must be first, and VolatileCallSite last in group */

when DirectMethodHandle is actually first.

Thanks.

@iklam
Copy link
Member Author

iklam commented Jun 15, 2022

Seems fine.

There are related comments about ordering and 1.4 JDKs in vmClassMacros.hpp that should also be cleaned up. I find it interesting it says

/* Note: MethodHandle must be first, and VolatileCallSite last in group */

when DirectMethodHandle is actually first.

Thanks.

I removed the out-dated comments about supporting earlier JDKs. Also removed the info about the ordering of the MethodHandle classes. I have no idea whether or why the ordering is important, but this mystery should be covered by the comment about the VM_CLASSES_DO macro definition.

// The order of these definitions is significant: the classes are
// resolved by vmClasses::resolve_all() in this order. Changing the
// order may require careful restructuring of the VM start-up sequence.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Thanks for the update

@iklam
Copy link
Member Author

iklam commented Jun 15, 2022

Thanks @calvinccheung @dholmes-ora @coleenp for the review.
Passed tiers 1-4.

/integrate

@openjdk
Copy link

openjdk bot commented Jun 15, 2022

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

  • 9ff4034: 8288530: ProblemList serviceability/jvmti/VMObjectAlloc/VMObjectAllocTest.java in -Xcomp mode
  • 1855e9d: 8220732: setSeed(long) java api doc is missing warning about provided seed quality
  • 6d59561: 8288425: Footprint regression due MH creation when initializing StringConcatFactory
  • 3475e12: 8288330: Avoid redundant ConcurrentHashMap.get call in Http2ClientImpl.deleteConnection
  • cb5ef3d: 8288499: Restore cancel-in-progress in GHA
  • 13d4ddc: 8286962: java/net/httpclient/ServerCloseTest.java failed once with ConnectException
  • 6633855: 8288399: MacOS debug symbol files not always deterministic in reproducible builds
  • d5cd2f2: 8284849: Add deoptimization to unified logging
  • dfeeb6f: 8288140: Avoid redundant Hashtable.get call in Signal.handle
  • 68b2057: 8287373: remove unnecessary paddings in generated code
  • ... and 7 more: https://git.openjdk.org/jdk/compare/fb297705f6dc668bea0257efb9c46b90b5eab2e9...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 15, 2022

@iklam Pushed as commit 0761228.

💡 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
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants