diff options
| -rw-r--r-- | test/ruby/test_call.rb | 9 | ||||
| -rw-r--r-- | vm_args.c | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/test/ruby/test_call.rb b/test/ruby/test_call.rb index 88a0df4388..a272d9d0dd 100644 --- a/test/ruby/test_call.rb +++ b/test/ruby/test_call.rb @@ -132,6 +132,15 @@ class TestCall < Test::Unit::TestCase assert_equal([0, 1, 2, b], aaa(0, *ary, &ary.pop), bug16504) end + def test_call_args_splat_with_nonhash_keyword_splat + o = Object.new + def o.to_hash; {a: 1} end + def self.f(*a, **kw) + kw + end + assert_equal Hash, f(*[], **o).class + end + OVER_STACK_LEN = (ENV['RUBY_OVER_STACK_LEN'] || 150).to_i # Greater than VM_ARGC_STACK_MAX OVER_STACK_ARGV = OVER_STACK_LEN.times.to_a.freeze @@ -549,6 +549,8 @@ setup_parameters_complex(rb_execution_context_t * const ec, const rb_iseq_t * co converted_keyword_hash = check_kwrestarg(converted_keyword_hash, &kw_flag); rb_ary_push(args->rest, converted_keyword_hash); keyword_hash = Qnil; + } else { + keyword_hash = converted_keyword_hash; } int len = RARRAY_LENINT(args->rest); |