Skip to content

Add vectorcall (PEP 590) dispatch for function calls #7329

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
youknowone merged 4 commits into from
Mar 3, 2026
Merged

Add vectorcall (PEP 590) dispatch for function calls #7329

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8175bb7
Add vectorcall (PEP 590) dispatch for function calls
youknowone Mar 3, 2026
2226ae8
Optimize vectorcall: move args instead of clone, use vectorcall in sp…
youknowone Mar 3, 2026
981dafd
Auto-format: cargo fmt --all
github-actions[bot] Mar 3, 2026
4d8cf97
Fix vectorcall_native_function kwarg slice out-of-bounds
youknowone Mar 3, 2026
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
Prev Previous commit
Next Next commit
Auto-format: cargo fmt --all
  • Loading branch information
@github-actions
github-actions[bot] committed Mar 3, 2026
commit 981dafd5207746f9f84fc2497b564a65f15cf34c
3 changes: 2 additions & 1 deletion crates/vm/src/builtins/builtin_func.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,8 @@ fn vectorcall_native_function(
pos_args.extend(args.into_iter().take(nargs));

if let Some(kwnames_slice) = kwnames {
let kwargs = FuncArgs::from_vectorcall(&pos_args, total_pos, Some(kwnames_slice)).kwargs;
let kwargs =
FuncArgs::from_vectorcall(&pos_args, total_pos, Some(kwnames_slice)).kwargs;
FuncArgs {
args: pos_args,
kwargs,
Expand Down
39 changes: 10 additions & 29 deletions crates/vm/src/frame.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3935,8 +3935,7 @@ impl ExecutingFrame<'_> {
&& cached_version != 0
{
let nargs_usize = nargs as usize;
let pos_args: Vec<PyObjectRef> =
self.pop_multiple(nargs_usize).collect();
let pos_args: Vec<PyObjectRef> = self.pop_multiple(nargs_usize).collect();
let self_or_null = self.pop_value_opt();
let callable = self.pop_value();
let (args_vec, effective_nargs) = if let Some(self_val) = self_or_null {
Expand Down Expand Up @@ -3968,20 +3967,14 @@ impl ExecutingFrame<'_> {
&& cached_version != 0
{
let nargs_usize = nargs as usize;
let pos_args: Vec<PyObjectRef> =
self.pop_multiple(nargs_usize).collect();
let pos_args: Vec<PyObjectRef> = self.pop_multiple(nargs_usize).collect();
let self_val = self.pop_value();
let callable = self.pop_value();
let mut args_vec = Vec::with_capacity(nargs_usize + 1);
args_vec.push(self_val);
args_vec.extend(pos_args);
let result = vectorcall_function(
&callable,
args_vec,
nargs_usize + 1,
None,
vm,
)?;
let result =
vectorcall_function(&callable, args_vec, nargs_usize + 1, None, vm)?;
self.push_value(result);
Ok(None)
} else {
Expand Down Expand Up @@ -4248,8 +4241,7 @@ impl ExecutingFrame<'_> {
.downcast_ref::<PyTuple>()
.expect("kwarg names should be tuple");
let kw_count = kwarg_names_tuple.len();
let all_args: Vec<PyObjectRef> =
self.pop_multiple(nargs_usize).collect();
let all_args: Vec<PyObjectRef> = self.pop_multiple(nargs_usize).collect();
let self_or_null = self.pop_value_opt();
let callable = self.pop_value();
let pos_count = nargs_usize - kw_count;
Expand Down Expand Up @@ -4293,22 +4285,16 @@ impl ExecutingFrame<'_> {
.downcast_ref::<PyTuple>()
.expect("kwarg names should be tuple");
let kw_count = kwarg_names_tuple.len();
let all_args: Vec<PyObjectRef> =
self.pop_multiple(nargs_usize).collect();
let all_args: Vec<PyObjectRef> = self.pop_multiple(nargs_usize).collect();
let self_val = self.pop_value();
let callable = self.pop_value();
let pos_count = nargs_usize - kw_count;
let mut args_vec = Vec::with_capacity(nargs_usize + 1);
args_vec.push(self_val);
args_vec.extend(all_args);
let kwnames = kwarg_names_tuple.as_slice();
let result = vectorcall_function(
&callable,
args_vec,
pos_count + 1,
Some(kwnames),
vm,
)?;
let result =
vectorcall_function(&callable, args_vec, pos_count + 1, Some(kwnames), vm)?;
self.push_value(result);
return Ok(None);
}
Expand Down Expand Up @@ -5807,11 +5793,7 @@ impl ExecutingFrame<'_> {
let has_self = self_or_null.is_some();

let pos_count = nargs_usize - kw_count;
let effective_nargs = if has_self {
pos_count + 1
} else {
pos_count
};
let effective_nargs = if has_self { pos_count + 1 } else { pos_count };

// Build the full args slice: positional (including self) + kwarg values
let total_args = effective_nargs + kw_count;
Expand All @@ -5828,8 +5810,7 @@ impl ExecutingFrame<'_> {
self.state.stack.truncate(callable_idx);

let kwnames = kwarg_names_tuple.as_slice();
let result =
callable_obj.vectorcall(args_vec, effective_nargs, Some(kwnames), vm)?;
let result = callable_obj.vectorcall(args_vec, effective_nargs, Some(kwnames), vm)?;
self.push_value(result);
Ok(None)
}
Expand Down
6 changes: 3 additions & 3 deletions crates/vm/src/types/slot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,9 @@ pub(crate) type GenericMethod = fn(&PyObject, FuncArgs, &VirtualMachine) -> PyRe
/// nargs: number of positional args (self prepended by caller if needed).
/// kwnames: keyword argument names (last kwnames.len() entries in args are kwarg values).
pub(crate) type VectorCallFunc = fn(
&PyObject, // callable
Vec<PyObjectRef>, // owned args (positional + kwarg values)
usize, // nargs (positional count)
&PyObject, // callable
Vec<PyObjectRef>, // owned args (positional + kwarg values)
usize, // nargs (positional count)
Option<&[PyObjectRef]>, // kwnames (keyword argument names)
&VirtualMachine,
) -> PyResult;
Expand Down
Loading