-
Notifications
You must be signed in to change notification settings - Fork 729
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
Revert initializeMethodRunAddressNoHook #20763
Revert initializeMethodRunAddressNoHook #20763
Conversation
Fyi @ThanHenderson. @tajila could you please review? |
For some context, I moved:
from I also added Taking another look at things, the code in However, should
@babsingh looking at the diffs, you added |
Ah right, I was supposed to move both when opening this PR, but for some reason only remembered to remove the modification to the extra field. I think it's probably safest to move them back, but I'll wait for Babneet's response. |
We should move it back. The order matters due to the JIT dependency: |
Just to clarify, by "order matters" here, you aren't saying anything about |
Not completely sure about the dependency with the hook. The |
The hooks definition: Lines 483 to 493 in c714a1e
|
Both
|
I do see at least this in
However, I'm not sure if there's other heuristics based on the value set. It might be that it's best we revert |
3c36ee1
to
cae7188
Compare
Wouldn't we be missing the correct binding (or at least go through a longer path) for the Method Handle send targets (e.g. |
I don't know the answer to this; perhaps @tajila or @babsingh could comment on it. |
We reviewed the internal code review for the original change. Initially, For other potential improvements, we will need to discuss the impact on |
The commit message and PR description need to be updated to highlight the revert. Otherwise, the changes LGTM. |
initializeMethodRunAddressNoHook is called by JIT'd code when it needs to revert to the interpeter. Openj9:20387 modified this function to set the extra to 0x1. However, resetting the extra can result in hang (see OpenJ9:20750 for details). This commit reverts the change specific to initializeMethodRunAddressNoHook. Signed-off-by: Irwin D'Souza <[email protected]>
cae7188
to
5f27449
Compare
jenkins test sanity zlinux jdk11,jdk21 |
initializeMethodRunAddressNoHook
is called by JIT'd code when it needsto revert to the interpeter. #20387 modified this function to set
the extra to
0x1
. However, resetting the extra can result in hang(see #20750 for details).
This commit reverts the change specific to
initializeMethodRunAddressNoHook
.Closes #20750
Fixes #20663