From 5414de4b6e4372af832e338f8eb7a9fe8de17c84 Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Thu, 30 Dec 2021 11:13:37 -0800 Subject: YJIT: Fix SP index with optarg and unordered kwarg Previously when we were calling a method with an optional argument and multiple keywords arguments which weren't in the order the receiver expected we would use the wrong SP index to rearrange them. Fixes Bug #18453 --- yjit_codegen.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'yjit_codegen.c') diff --git a/yjit_codegen.c b/yjit_codegen.c index 8a547d2ef6..21e4813c19 100644 --- a/yjit_codegen.c +++ b/yjit_codegen.c @@ -3671,7 +3671,10 @@ gen_send_iseq(jitstate_t *jit, ctx_t *ctx, const struct rb_callinfo *ci, const r if (doing_kw_call) { // Here we're calling a method with keyword arguments and specifying // keyword arguments at this call site. - const int lead_num = iseq->body->param.lead_num; + + // Number of positional arguments the callee expects before the first + // keyword argument + const int args_before_kw = required_num + opt_num; // This struct represents the metadata about the caller-specified // keyword arguments. @@ -3761,7 +3764,7 @@ gen_send_iseq(jitstate_t *jit, ctx_t *ctx, const struct rb_callinfo *ci, const r if (callee_kwarg == caller_kwargs[swap_idx]) { // First we're going to generate the code that is going // to perform the actual swapping at runtime. - stack_swap(ctx, cb, argc - 1 - swap_idx - lead_num, argc - 1 - kwarg_idx - lead_num, REG1, REG0); + stack_swap(ctx, cb, argc - 1 - swap_idx - args_before_kw, argc - 1 - kwarg_idx - args_before_kw, REG1, REG0); // Next we're going to do some bookkeeping on our end so // that we know the order that the arguments are -- cgit v1.2.3