address review: check datastack space for extra_bytes, require CO_OPTIMIZED in vectorcall fast path

youknowone · youknowone · commit e84ac3ce2356 · 2026-03-09T02:10:54.000+09:00
diff --git a/.cspell.json b/.cspell.json
@@ -60,8 +60,6 @@
     "dedentations",
     "dedents",
     "deduped",
-    "compactlong",
-    "compactlongs",
     "deoptimize",
     "descrs",
     "downcastable",
diff --git a/crates/vm/src/builtins/function.rs b/crates/vm/src/builtins/function.rs
@@ -1374,6 +1374,7 @@ pub(crate) fn vectorcall_function(
 
     let has_kwargs = kwnames.is_some_and(|kw| !kw.is_empty());
     let is_simple = !has_kwargs
+        && code.flags.contains(bytecode::CodeFlags::OPTIMIZED)
         && !code.flags.contains(bytecode::CodeFlags::VARARGS)
         && !code.flags.contains(bytecode::CodeFlags::VARKEYWORDS)
         && code.kwonlyarg_count == 0
diff --git a/crates/vm/src/frame.rs b/crates/vm/src/frame.rs
@@ -1,3 +1,5 @@
+// spell-checker: ignore compactlong compactlongs
+
 use crate::anystr::AnyStr;
 #[cfg(feature = "flame")]
 use crate::bytecode::InstructionMetadata;
@@ -8747,7 +8749,7 @@ impl ExecutingFrame<'_> {
             Some(frame_size) => frame_size
                 .checked_add(extra_bytes)
                 .is_some_and(|size| vm.datastack_has_space(size)),
-            None => true,
+            None => extra_bytes == 0 || vm.datastack_has_space(extra_bytes),
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// spell-checker: ignore compactlong compactlongs`
	`2`	`+`
`1`	`3`	`use crate::anystr::AnyStr;`
`2`	`4`	`#[cfg(feature = "flame")]`
`3`	`5`	`use crate::bytecode::InstructionMetadata;`
`@@ -8747,7 +8749,7 @@ impl ExecutingFrame<'_> {`
`8747`	`8749`	`Some(frame_size) => frame_size`
`8748`	`8750`	`.checked_add(extra_bytes)`
`8749`	`8751`	`.is_some_and(\|size\| vm.datastack_has_space(size)),`
`8750`		`- None => true,`
	`8752`	`+ None => extra_bytes == 0 \|\| vm.datastack_has_space(extra_bytes),`
`8751`	`8753`	`}`
`8752`	`8754`	`}`
`8753`	`8755`