diff options
author | John Hawthorn <john@hawthorn.email> | 2021-12-30 11:13:37 -0800 |
---|---|---|
committer | John Hawthorn <john@hawthorn.email> | 2021-12-31 17:30:47 -0800 |
commit | 5414de4b6e4372af832e338f8eb7a9fe8de17c84 (patch) | |
tree | d2d8de6dc8a182558e6719508393b03017e8f112 | |
parent | 2fac066b3ad67767107cab30e1dd9a00562f1376 (diff) | |
download | ruby-5414de4b6e4372af832e338f8eb7a9fe8de17c84.tar.gz |
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
-rw-r--r-- | bootstraptest/test_yjit.rb | 16 | ||||
-rw-r--r-- | yjit_codegen.c | 7 |
2 files changed, 21 insertions, 2 deletions
diff --git a/bootstraptest/test_yjit.rb b/bootstraptest/test_yjit.rb index 05947c48ed..30298a820d 100644 --- a/bootstraptest/test_yjit.rb +++ b/bootstraptest/test_yjit.rb @@ -2280,6 +2280,22 @@ assert_equal '[[1, 2, 3]]', %q{ 5.times.map { opt_and_kwargs(1, 2, c: 3) }.uniq } +# Bug #18453 +assert_equal '[[1, nil, 2]]', %q{ + def opt_and_kwargs(a = {}, b: nil, c: nil) + [a, b, c] + end + + 5.times.map { opt_and_kwargs(1, c: 2) }.uniq +} + +assert_equal '[[{}, nil, 1]]', %q{ + def opt_and_kwargs(a = {}, b: nil, c: nil) + [a, b, c] + end + + 5.times.map { opt_and_kwargs(c: 1) }.uniq +} # leading and keyword arguments are swapped into the right order assert_equal '[[1, 2, 3, 4, 5, 6]]', %q{ 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 |