Skip to content

fix: correct polymorphic calls to java.lang.invoke Holder inner classes #557

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 21, 2025
Merged

fix: correct polymorphic calls to java.lang.invoke Holder inner classes #557

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions ristretto_vm/src/intrinsic_methods/java/lang/invoke/methodhandlenatives.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,9 @@ async fn resolve_method(
let method_name = name.as_string()?;
let method_descriptor = format!("({}){return_descriptor}", parameter_descriptors.concat());
let method = match class.name() {
"java.lang.invoke.DelegatingMethodHandle$Holder"
| "java.lang.invoke.DirectMethodHandle$Holder"
| "java.lang.invoke.Invokers$Holder" => {
"java/lang/invoke/DelegatingMethodHandle$Holder"
| "java/lang/invoke/DirectMethodHandle$Holder"
| "java/lang/invoke/Invokers$Holder" => {
resolve_holder_methods(class.clone(), &method_name, &method_descriptor)?
}
_ => class.try_get_method(&method_name, &method_descriptor)?,
Expand Down Expand Up @@ -544,12 +544,12 @@ pub(crate) async fn resolve_1(
mut parameters: Parameters,
) -> Result<Option<Value>> {
let speculative_resolve = parameters.pop_bool()?;
let caller = match parameters.pop() {
Ok(caller) => {
let caller = get_class(&thread, &caller).await?;
Some(caller)
}
Err(_) => None,
let caller = parameters.pop()?;
let caller = if caller.is_null() {
None
} else {
let caller = get_class(&thread, &caller).await?;
Some(caller)
};
let member_self = parameters.pop()?;
resolve(
Expand All @@ -573,12 +573,12 @@ pub(crate) async fn resolve_2(
) -> Result<Option<Value>> {
let speculative_resolve = parameters.pop_bool()?;
let lookup_mode = LookupModeFlags::from_bits_truncate(parameters.pop_int()?);
let caller = match parameters.pop() {
Ok(caller) => {
let caller = get_class(&thread, &caller).await?;
Some(caller)
}
Err(_) => None,
let caller = parameters.pop()?;
let caller = if caller.is_null() {
None
} else {
let caller = get_class(&thread, &caller).await?;
Some(caller)
};
let member_self = parameters.pop()?;
resolve(
Expand Down
Loading