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

Handle missed BME case in resolveInvokeDynamic for OJDK MHs #18574

Merged
merged 1 commit into from
Dec 8, 2023

Conversation

ThanHenderson
Copy link
Contributor

@ThanHenderson ThanHenderson commented Dec 7, 2023

This patch fixes a missed BootstrapMethodError-wrapping case for OJDK MHs in MethodHandleNatives.resolveInvokeDynamic when there is an error thrown during MethodType resolution.

Signed-off-by: Nathan Henderson nathan.henderson@ibm.com

@ThanHenderson
Copy link
Contributor Author

ThanHenderson commented Dec 7, 2023

@ThanHenderson
Copy link
Contributor Author

ping @babsingh

@babsingh
Copy link
Contributor

babsingh commented Dec 7, 2023

jenkins test sanity.functional,sanity.openjdk plinux jdk8,jdk11,jdk17

@babsingh
Copy link
Contributor

babsingh commented Dec 7, 2023

jenkins test sanity.functional,sanity.openjdk zlinuxojdk292 jdk8,jdk11

@ThanHenderson
Copy link
Contributor Author

ThanHenderson commented Dec 7, 2023

The build failures are caused by adding the suggested changes here: https://github.com/eclipse-openj9/openj9/pull/18474/files#r1402752007 The builds here: #18574 (comment) were from before adding in those suggested changes.

I will partially revert the changes to retain the resultHandle local to avoid odd inline casting.

This patch fixes a missed BootstrapMethodError-wrapping case
for OJDK MHs in resolveInvokeDynamic when there is an error
thrown during MethodType resolution.

Signed-off-by: Nathan Henderson <nathan.henderson@ibm.com>
@babsingh
Copy link
Contributor

babsingh commented Dec 8, 2023

jenkins test sanity.functional,sanity.openjdk zlinuxojdk292 jdk8,jdk11

@babsingh
Copy link
Contributor

babsingh commented Dec 8, 2023

jenkins test sanity.functional,sanity.openjdk plinux jdk8,jdk17

@ThanHenderson
Copy link
Contributor Author

Test failures:

@babsingh
Copy link
Contributor

babsingh commented Dec 8, 2023

@babsingh babsingh merged commit f899fab into eclipse-openj9:master Dec 8, 2023
11 of 15 checks passed
@ThanHenderson ThanHenderson added jdk8 comp:vm jdk11 project:MH Used to track Method Handles related work labels Jan 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
comp:vm jdk8 jdk11 project:MH Used to track Method Handles related work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants