8329628: Additional changes after JDK-8329332

[vnkozlov]

Additional clean up based on comments (mostly Stefan's) during reviews for JDK-8329332: Remove CompiledMethod and CodeBlobLayout classes.

• Renamed CompiledMethod_lock to NMethod_lock. (I decided to not change JVMTI's CompiledMethod[Load|Unload] names).
• Renamed NMethodIterator::all_blobs to NMethodIterator::all.
• Moved get_deopt_original_pc() method from nmethod to frame class.
• Reverted CodeCache::find_nmethod() to previous functionality to allow return nullptr and be consistent with find_blob().
• Cleanup some (nmethod*) casts.
• Use for (CodeHeap* heap : *_nmethod_heaps) in CodeCache::nmethod_count() (it was @stefank suggestion, I don't know how this C++ magic works). I verified it running with -XX:+PrintNMethodStatistics.

Testing tier1-3,xcomp,stress

---

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-8329628: Additional changes after JDK-8329332 (Enhancement - P4)

Reviewers

• Stefan Karlsson (@stefank - Reviewer)
• Erik Österlund (@fisk - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18665

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back kvn! 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]

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

8329628: Additional changes after JDK-8329332

Reviewed-by: stefank, eosterlund

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

• 1e02a13: 8328614: hsdis: dlsym can't find decode symbol
• 23d161d: 8328630: Add logging when needed symbols in dll are missing.
• 2e925f2: 8329726: Use non-short forward jumps in lightweight locking
• e75e1cb: 8329955: Class-File API ClassPrinter does not print bootstrap methods arguments
• f9bc2db: 8325371: Missing ClassFile.Option in package summary
• a8fbeec: 8329956: G1: Remove unimplemented collection_set_candidate_short_type_str
• 3b6629c: 8324673: javacserver failed during build: RejectedExecutionException
• 5fb5e6c: 8329603: G1: Merge G1BlockOffsetTablePart into G1BlockOffsetTable
• 2fcb816: 8305072: Win32ShellFolder2.compareTo is inconsistent
• 635cb3c: 8329745: Update the documentation of ServerSocket and Socket to refer to StandardSocketOptions instead of legacy SocketOptions
• ... and 37 more: https://git.openjdk.org/jdk/compare/040c93565c0dff6270911eb9e58d78aa01bbb925...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]

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

• graal
• hotspot

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.

[mlbridge]

Webrevs

• 01: Full - Incremental (c33c9a6c)
• 00: Full (5a41bd5b)

[stefank]

Looks good. I've added two suggestions. You can choose to make them, handle them as separate issues, or just ignore them. :)

[fisk]

I was never a fan of the CompiledMethod_lock name, as it is quite general but only protects a very specific thing: the state. With the NMethod_lock it gets slightly more awkward since the concurrent GCs already have an "nmethod lock" in the GC data of nmethods. Could this lock be called NMethodState_lock instead, to more clearly describe what exactly it is about nmethods that it guards?

[vnkozlov]

I did all suggested changes.

[vnkozlov]

/integrate

[vnkozlov]

Thank you, @stefank and @fisk, for reviews.

[openjdk]

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

• 1e02a13: 8328614: hsdis: dlsym can't find decode symbol
• 23d161d: 8328630: Add logging when needed symbols in dll are missing.
• 2e925f2: 8329726: Use non-short forward jumps in lightweight locking
• e75e1cb: 8329955: Class-File API ClassPrinter does not print bootstrap methods arguments
• f9bc2db: 8325371: Missing ClassFile.Option in package summary
• a8fbeec: 8329956: G1: Remove unimplemented collection_set_candidate_short_type_str
• 3b6629c: 8324673: javacserver failed during build: RejectedExecutionException
• 5fb5e6c: 8329603: G1: Merge G1BlockOffsetTablePart into G1BlockOffsetTable
• 2fcb816: 8305072: Win32ShellFolder2.compareTo is inconsistent
• 635cb3c: 8329745: Update the documentation of ServerSocket and Socket to refer to StandardSocketOptions instead of legacy SocketOptions
• ... and 37 more: https://git.openjdk.org/jdk/compare/040c93565c0dff6270911eb9e58d78aa01bbb925...master

Your commit was automatically rebased without conflicts.

[openjdk]

@vnkozlov Pushed as commit 6736792.

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