Use from_vectorcall_owned in descriptor/type vectorcall, add stack debug_asserts

youknowone · youknowone · commit 4a91e0a0b5c3 · 2026-03-04T04:32:55.000+09:00
diff --git a/crates/vm/src/builtins/descriptor.rs b/crates/vm/src/builtins/descriptor.rs
@@ -435,14 +435,14 @@ fn vectorcall_method_descriptor(
     vm: &VirtualMachine,
 ) -> PyResult {
     let zelf: &Py<PyMethodDescriptor> = zelf_obj.downcast_ref().unwrap();
-    let func_args = FuncArgs::from_vectorcall(&args, nargs, kwnames);
+    let func_args = FuncArgs::from_vectorcall_owned(args, nargs, kwnames);
     (zelf.method.func)(vm, func_args)
 }
 
 /// Vectorcall for wrapper_descriptor: calls wrapped slot function
 fn vectorcall_wrapper(
     zelf_obj: &PyObject,
-    args: Vec<PyObjectRef>,
+    mut args: Vec<PyObjectRef>,
     nargs: usize,
     kwnames: Option<&[PyObjectRef]>,
     vm: &VirtualMachine,
@@ -456,7 +456,7 @@ fn vectorcall_wrapper(
             zelf.typ.name()
         )));
     }
-    let obj = args[0].clone();
+    let obj = args.remove(0);
     if !obj.fast_isinstance(zelf.typ) {
         return Err(vm.new_type_error(format!(
             "descriptor '{}' requires a '{}' object but received a '{}'",
@@ -465,7 +465,7 @@ fn vectorcall_wrapper(
             obj.class().name()
         )));
     }
-    let rest = FuncArgs::from_vectorcall(&args[1..], nargs - 1, kwnames);
+    let rest = FuncArgs::from_vectorcall_owned(args, nargs - 1, kwnames);
     zelf.wrapped.call(obj, rest, vm)
 }
 
diff --git a/crates/vm/src/builtins/type.rs b/crates/vm/src/builtins/type.rs
@@ -2356,7 +2356,7 @@ fn vectorcall_type(
     }
 
     // Fallback: construct FuncArgs and use standard call
-    let func_args = FuncArgs::from_vectorcall(&args, nargs, kwnames);
+    let func_args = FuncArgs::from_vectorcall_owned(args, nargs, kwnames);
     PyType::call(zelf, func_args, vm)
 }
 
diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs
@@ -5673,6 +5673,10 @@ impl ExecutingFrame<'_> {
     fn execute_call_vectorcall(&mut self, nargs: u32, vm: &VirtualMachine) -> FrameResult {
         let nargs_usize = nargs as usize;
         let stack_len = self.state.stack.len();
+        debug_assert!(
+            stack_len >= nargs_usize + 2,
+            "CALL stack underflow: need callable + self_or_null + {nargs_usize} args, have {stack_len}"
+        );
         let callable_idx = stack_len - nargs_usize - 2;
         let self_or_null_idx = stack_len - nargs_usize - 1;
         let args_start = stack_len - nargs_usize;
@@ -5717,8 +5721,13 @@ impl ExecutingFrame<'_> {
             .downcast_ref::<PyTuple>()
             .expect("kwarg names should be tuple");
         let kw_count = kwarg_names_tuple.len();
+        debug_assert!(kw_count <= nargs_usize, "CALL_KW kw_count exceeds nargs");
 
         let stack_len = self.state.stack.len();
+        debug_assert!(
+            stack_len >= nargs_usize + 2,
+            "CALL_KW stack underflow: need callable + self_or_null + {nargs_usize} args, have {stack_len}"
+        );
         let callable_idx = stack_len - nargs_usize - 2;
         let self_or_null_idx = stack_len - nargs_usize - 1;
         let args_start = stack_len - nargs_usize;

Original file line number	Diff line number	Diff line change
`@@ -2356,7 +2356,7 @@ fn vectorcall_type(`
`2356`	`2356`	`}`
`2357`	`2357`
`2358`	`2358`	`// Fallback: construct FuncArgs and use standard call`
`2359`		`- let func_args = FuncArgs::from_vectorcall(&args, nargs, kwnames);`
	`2359`	`+ let func_args = FuncArgs::from_vectorcall_owned(args, nargs, kwnames);`
`2360`	`2360`	`PyType::call(zelf, func_args, vm)`
`2361`	`2361`	`}`
`2362`	`2362`