From 73690b520da4c3ab680ddc477cacaeaeed75d558 Mon Sep 17 00:00:00 2001 From: Alan Wu Date: Sat, 4 Jan 2025 11:41:00 -0500 Subject: YJIT: Fix crash when yielding keyword arguments Previously, the code for dropping surplus arguments when yielding into blocks erroneously attempted to drop keyword arguments when there is in fact no surplus arguments. Fix the condition and test that supplying the exact number of keyword arguments as require compiles without fallback. --- yjit/src/codegen.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'yjit/src/codegen.rs') diff --git a/yjit/src/codegen.rs b/yjit/src/codegen.rs index 37ddbce0bb..d04da48c6a 100644 --- a/yjit/src/codegen.rs +++ b/yjit/src/codegen.rs @@ -8011,14 +8011,14 @@ fn gen_send_iseq( // Pop surplus positional arguments when yielding if arg_setup_block { - let extras = argc - required_num - opt_num; + let extras = argc - required_num - opt_num - kw_arg_num; if extras > 0 { // Checked earlier. If there are keyword args, then // the positional arguments are not at the stack top. assert_eq!(0, kw_arg_num); asm.stack_pop(extras as usize); - argc = required_num + opt_num; + argc = required_num + opt_num + kw_arg_num; } } -- cgit v1.2.3