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 --- bootstraptest/test_yjit.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'bootstraptest/test_yjit.rb') 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{ -- cgit v1.2.3