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

8332327: Return _methods_jmethod_ids field back in VMStructs #19254

Closed
wants to merge 1 commit into from

Conversation

apangin
Copy link

@apangin apangin commented May 15, 2024

The fix for JDK-8313332 has removed InstanceKlass::_methods_jmethod_ids field from VMStructs.

This broke async-profiler, since the profiler needs this field to obtain jmethodID in some corner cases.

There was no actual need for removal, as the field is still there in InstanceKlass. So, I propose to return the field back to restore the broken functionality of async-profiler. This is a no risk change, because it only exports an offset of one field and does not affect the JVM otherwise.


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-8332327: Return _methods_jmethod_ids field back in VMStructs (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19254

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

Using diff file

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

Webrev

Link to Webrev Comment

@apangin apangin changed the title JDK-8332327: Return _methods_jmethod_ids field back in VMStructs 8332327: Return _methods_jmethod_ids field back in VMStructs May 15, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented May 15, 2024

👋 Welcome back apangin! 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 May 15, 2024

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

8332327: Return _methods_jmethod_ids field back in VMStructs

Reviewed-by: cjplummer, sspitsyn, coleenp, shade

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

  • 2599151: 8331202: Support for Duration until another Instant
  • 6f7ddbe: 8260633: [macos] java/awt/dnd/MouseEventAfterStartDragTest/MouseEventAfterStartDragTest.html test failed
  • fa3e94d: 8332393: Problemlist compiler/rangechecks/TestArrayAccessAboveRCAfterRCCastIIEliminated.java
  • a33cb90: 8332098: Add missing @ since tags to jdk.jdi
  • 910d77b: 8331953: ubsan: metaspaceShared.cpp:1305:57: runtime error: applying non-zero offset 12849152 to null pointer
  • f9f8d0b: 8332101: Add an @since to StandardOperation:REMOVE in jdk.dynalink
  • f398cd2: 8331575: C2: crash when ConvL2I is split thru phi at LongCountedLoop
  • 96c5c3f: 8329998: Remove double initialization for parts of small TypeArrays in ZObjArrayAllocator
  • ee4a9d3: 8321622: ClassFile.verify(byte[] bytes) throws unexpected ConstantPoolException, IAE
  • ab8d7b0: 8324517: C2: crash in compiled code because of dependency on removed range check CastIIs
  • ... and 3 more: https://git.openjdk.org/jdk/compare/4083255440cfbf39b9683ea88a433d71ec6111e7...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 (@plummercj, @sspitsyn, @coleenp, @shipilev) 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 rfr Pull request is ready for review label May 15, 2024
@openjdk
Copy link

openjdk bot commented May 15, 2024

@apangin 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 May 15, 2024
@mlbridge
Copy link

mlbridge bot commented May 15, 2024

Webrevs

@apangin
Copy link
Author

apangin commented May 15, 2024

@coleenp Could you please review the PR since it reverts one line from one of your previous commits. Thanks.

@plummercj
Copy link
Contributor

/label serviceability

@openjdk openjdk bot added the serviceability serviceability-dev@openjdk.org label May 15, 2024
@openjdk
Copy link

openjdk bot commented May 15, 2024

@plummercj
The serviceability label was successfully added.

Copy link
Contributor

@plummercj plummercj left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 15, 2024
Copy link
Contributor

@sspitsyn sspitsyn 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 and low risk.

@apangin
Copy link
Author

apangin commented May 16, 2024

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label May 16, 2024
@openjdk
Copy link

openjdk bot commented May 16, 2024

@apangin
Your change (at version 1b9bddd) is now ready to be sponsored by a Committer.

@jdksjolen
Copy link
Contributor

Please wait 24 hours before attempting to integrate. In other words: Do not sponsor this until 24 hours has passed since opening the PR.

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

This is fine to revert. I didn't see this field in SA so eagerly removed it.

@shipilev
Copy link
Member

Please wait 24 hours before attempting to integrate. In other words: Do not sponsor this until 24 hours has passed since opening the PR.

OTOH, I would say this is good and trivial, so the usual 24 hour rule does not really apply. :)

@shipilev
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented May 17, 2024

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

  • f1ce9b0: 8331557: Serial: Refactor SerialHeap::do_collection
  • 14198f5: 8329653: JLILaunchTest fails on AIX after JDK-8329131
  • ae999ea: 8129418: JShell: better highlighting of errors in imports on demand
  • 6422efa: 8332394: Add friendly output when @ir rule missing value
  • 9160ef8: 8332237: [nmt] Remove the need for ThreadStackTracker::track_as_vm()
  • 7c750fd: 8331746: Create a test to verify that the cmm id is not ignored
  • de57d4b: 8332257: Shenandoah: Move evacuation methods to implementation file
  • da9c23a: 8325384: sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java failing intermittently when main thread is a virtual thread
  • dc184f1: 8324649: Shenandoah: replace implementation of free set
  • 2599151: 8331202: Support for Duration until another Instant
  • ... and 12 more: https://git.openjdk.org/jdk/compare/4083255440cfbf39b9683ea88a433d71ec6111e7...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 17, 2024
@openjdk openjdk bot closed this May 17, 2024
@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 May 17, 2024
@openjdk
Copy link

openjdk bot commented May 17, 2024

@shipilev @apangin Pushed as commit d84a8fd.

💡 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 serviceability serviceability-dev@openjdk.org
6 participants