8366461: Remove obsolete method handle invoke logic #27059

dean-long · 2025-09-02T19:21:48Z

At one time, JSR292 support needed special logic to save and restore SP across method handle instrinsic calls, but that is no longer the case. The only platform that still does the save/restore is arm32, which is no longer necessary. The save/restore can be removed along with related APIs and logic. Note that the arm32 port is largely based on the x86 port, which stopped doing the save/restore in jdk9 (JDK-8068945).

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-8366461: Remove obsolete method handle invoke logic (Enhancement - P4)

Reviewers

Vladimir Ivanov (@iwanowww - Reviewer)
Manuel Hässig (@mhaessig - Committer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 27059

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-09-02T19:22:37Z

👋 Welcome back dlong! 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 · 2025-09-02T19:23:01Z

@dean-long 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:

8366461: Remove obsolete method handle invoke logic

Reviewed-by: vlivanov, mhaessig

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

3f27a03: 8368727: CDS custom loader support causes asserts during class unloading
1d55ade: 8368989: Use NMethodMarkingScope and ThreadsClaimTokenScope in shenandoahSTWMark
3d113af: 8369051: More small Float16 refactorings
... and 113 more: https://git.openjdk.org/jdk/compare/17accf4a06fe654fef6db8dbd0dcd3411729316f...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 · 2025-09-02T19:23:37Z

@dean-long The following labels will be automatically applied to this pull request:

graal
hotspot
serviceability

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 · 2025-09-02T19:27:36Z

Webrevs

dean-long · 2025-09-02T20:35:34Z

/label hotspot-compiler hotspot-runtime

openjdk · 2025-09-02T20:37:15Z

@dean-long
The hotspot-compiler label was successfully added.

The hotspot-runtime label was successfully added.

iwanowww

Nice cleanup! Looks good.

dean-long · 2025-09-02T22:14:07Z

Thanks @iwanowww !

mhaessig

Thank you for cleaning this up, @dean-long. I just have a drive-by comment.

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64Frame.java

dean-long · 2025-09-10T01:06:59Z

I need one more review for this.

mhaessig

Thank you again for this extensive cleanup. I did another, more thorough, pass and have a few questions and suggestions.

src/hotspot/cpu/arm/arm_32.ad

mhaessig · 2025-09-24T11:14:01Z

src/hotspot/cpu/arm/frame_arm.cpp

  nmethod* sender_nm = (_cb == nullptr) ? nullptr : _cb->as_nmethod_or_null();
  if (sender_nm != nullptr) {
-    // If the sender PC is a deoptimization point, get the original
-    // PC.  For MethodHandle call site the unextended_sp is stored in
-    // saved_fp.
-    if (sender_nm->is_deopt_mh_entry(_pc)) {
-      DEBUG_ONLY(verify_deopt_mh_original_pc(sender_nm, _fp));
-      _unextended_sp = _fp;
-    }
-    else if (sender_nm->is_deopt_entry(_pc)) {
+    // If the sender PC is a deoptimization point, get the original PC.
+    if (sender_nm->is_deopt_entry(_pc)) {
      DEBUG_ONLY(verify_deopt_original_pc(sender_nm, _unextended_sp));
    }
-    else if (sender_nm->is_method_handle_return(_pc)) {
-      _unextended_sp = _fp;
-    }
  }


All of this could be NOT_PRODUCT and the method const if I did not miss any side effects.

Right, there is no adjustment anymore on any platform. I think this function and verify_deopt_original_pc only ever existed to support code that is now getting removed. So I could change the name to verify_unextended_sp() and make it const, but it might make more sense to remove both this function and verify_deopt_original_pc now. What do you think?

I would rather keep this code as a debug only sanity check, but I would refactor it into a single function. Then the question remains what to do with the SA code, that still does nothing.

I would rather keep this code as a debug only sanity check, but I would refactor it into a single function. Then the question remains what to do with the SA code, that still does nothing.

I think we can do even better and get rid of adjust_unextended_sp, moving the debug check into get_deopt_original_pc. This moves the SA changes into shared code, and fixes the anomaly that s390 never called adjust_unextended_sp and thus never called the debug code to do the sanity check.

That is indeed even better. Nice.

src/hotspot/cpu/arm/frame_arm.hpp

src/hotspot/cpu/arm/register_arm.hpp

src/hotspot/share/code/debugInfoRec.hpp

src/hotspot/share/opto/matcher.hpp

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/PCDesc.java

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64Frame.java

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/riscv64/RISCV64Frame.java

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java

mhaessig

I have one last nit below. Otherwise, this looks good to me.

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Frame.java

mhaessig · 2025-09-26T07:12:10Z

src/hotspot/cpu/arm/frame_arm.cpp

  nmethod* sender_nm = (_cb == nullptr) ? nullptr : _cb->as_nmethod_or_null();
  if (sender_nm != nullptr) {
-    // If the sender PC is a deoptimization point, get the original
-    // PC.  For MethodHandle call site the unextended_sp is stored in
-    // saved_fp.
-    if (sender_nm->is_deopt_mh_entry(_pc)) {
-      DEBUG_ONLY(verify_deopt_mh_original_pc(sender_nm, _fp));
-      _unextended_sp = _fp;
-    }
-    else if (sender_nm->is_deopt_entry(_pc)) {
+    // If the sender PC is a deoptimization point, get the original PC.
+    if (sender_nm->is_deopt_entry(_pc)) {
      DEBUG_ONLY(verify_deopt_original_pc(sender_nm, _unextended_sp));
    }
-    else if (sender_nm->is_method_handle_return(_pc)) {
-      _unextended_sp = _fp;
-    }
  }


That is indeed even better. Nice.

…ame.java Co-authored-by: Manuel Hässig <manuel@haessig.org>

dean-long · 2025-09-26T20:04:24Z

Thanks @mhaessig for the review.

dean-long · 2025-09-26T20:19:38Z

/integrate

openjdk · 2025-09-26T20:21:37Z

@dean-long This pull request has not yet been marked as ready for integration.

dean-long · 2025-10-02T00:52:09Z

@iwanowww , I think I need you to re-review the final version.

iwanowww

Still looks good.

dean-long · 2025-10-02T22:20:11Z

Thanks Vladimir for the re-review.

dean-long · 2025-10-02T22:20:18Z

/integrate

openjdk · 2025-10-02T22:21:17Z

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

fa6e884: 8298823: [macos] java/awt/Mouse/EnterExitEvents/DragWindowTest.java continues to fail with "No MouseReleased event on label!"
3f27a03: 8368727: CDS custom loader support causes asserts during class unloading
1d55ade: 8368989: Use NMethodMarkingScope and ThreadsClaimTokenScope in shenandoahSTWMark
... and 114 more: https://git.openjdk.org/jdk/compare/17accf4a06fe654fef6db8dbd0dcd3411729316f...master

Your commit was automatically rebased without conflicts.

openjdk · 2025-10-02T22:21:25Z

@dean-long Pushed as commit da7121a.

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

dean-long added 2 commits August 29, 2025 19:27

first pass

2c06413

Merge branch 'openjdk:master' into 8366461-mh-invoke

4998cac

openjdk bot added graal graal-dev@openjdk.org serviceability serviceability-dev@openjdk.org hotspot hotspot-dev@openjdk.org rfr Pull request is ready for review labels Sep 2, 2025

dean-long added 2 commits September 2, 2025 12:52

arm32 build

303305a

cleanup

cf7d016

dean-long marked this pull request as draft September 2, 2025 20:06

openjdk bot removed the rfr Pull request is ready for review label Sep 2, 2025

undo debug changes

25e7803

openjdk bot added hotspot-compiler hotspot-compiler-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org labels Sep 2, 2025

revert whitespace change

eac482a

dean-long marked this pull request as ready for review September 2, 2025 20:49

openjdk bot added the rfr Pull request is ready for review label Sep 2, 2025

iwanowww approved these changes Sep 2, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Sep 2, 2025

mhaessig reviewed Sep 3, 2025

View reviewed changes

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/aarch64/AARCH64Frame.java Outdated Show resolved Hide resolved

dougxc mentioned this pull request Sep 3, 2025

8364670: Extend JVMCI to express fixed binding #26652

Closed

3 tasks

mhaessig suggested changes Sep 24, 2025

View reviewed changes

Merge branch 'openjdk:master' into 8366461-mh-invoke

a4f2383

openjdk bot removed hotspot-runtime hotspot-runtime-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org labels Sep 24, 2025

copyright year update

81d5686

openjdk bot removed the ready Pull request is ready to be integrated label Sep 24, 2025

dean-long added 3 commits September 24, 2025 14:42

copyright year update

10668bd

more cleanup

814693f

copyright year update

6a1062c

mhaessig approved these changes Sep 26, 2025

View reviewed changes

Update src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/Fr…

d25872b

…ame.java Co-authored-by: Manuel Hässig <manuel@haessig.org>

dean-long requested a review from iwanowww September 26, 2025 20:40

mhaessig approved these changes Sep 29, 2025

View reviewed changes

iwanowww approved these changes Oct 2, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Oct 2, 2025

openjdk bot added the integrated Pull request has been integrated label Oct 2, 2025

openjdk bot closed this Oct 2, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 2, 2025

8366461: Remove obsolete method handle invoke logic #27059

8366461: Remove obsolete method handle invoke logic #27059

Uh oh!

Conversation

dean-long commented Sep 2, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Sep 2, 2025

Uh oh!

openjdk bot commented Sep 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Sep 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mlbridge bot commented Sep 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

dean-long commented Sep 2, 2025

Uh oh!

openjdk bot commented Sep 2, 2025

Uh oh!

iwanowww left a comment

Choose a reason for hiding this comment

Uh oh!

dean-long commented Sep 2, 2025

Uh oh!

mhaessig left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dean-long commented Sep 10, 2025

Uh oh!

mhaessig left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mhaessig Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

dean-long Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

mhaessig Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

dean-long Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

mhaessig Sep 26, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mhaessig left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mhaessig Sep 26, 2025

Choose a reason for hiding this comment

Uh oh!

dean-long commented Sep 26, 2025

Uh oh!

dean-long commented Sep 26, 2025

Uh oh!

openjdk bot commented Sep 26, 2025

Uh oh!

dean-long commented Oct 2, 2025

Uh oh!

dean-long commented Sep 2, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Sep 2, 2025 •

edited

Loading

openjdk bot commented Sep 2, 2025 •

edited

Loading

mlbridge bot commented Sep 2, 2025 •

edited

Loading