From 140929d8ba0e184a5c84ff6aa9c77ed5832eef68 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 3 Jun 2014 19:08:40 +0000 Subject: vm.c: return the result hash * vm.c (core_hash_merge_kwd): should return the result hash, which may be converted from and differ from the given argument. [ruby-core:62921] [Bug #9898] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/ruby/test_keyword.rb | 11 +++++++++++ vm.c | 1 + 3 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index 34ea527f8f..feae7487b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jun 4 04:08:37 2014 Nobuyoshi Nakada + + * vm.c (core_hash_merge_kwd): should return the result hash, which + may be converted from and differ from the given argument. + [ruby-core:62921] [Bug #9898] + Tue Jun 3 23:32:34 2014 Tanaka Akira * ruby.c (load_file_internal2): Extracted from load_file_internal. diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb index 5988905138..68dd8a91cf 100644 --- a/test/ruby/test_keyword.rb +++ b/test/ruby/test_keyword.rb @@ -452,6 +452,17 @@ class TestKeywordArguments < Test::Unit::TestCase assert_equal({a: 1}, h, bug9776) end + def test_splat_hash_conversion + bug9898 = '[ruby-core:62921] [Bug #9898]' + + o = Object.new + def o.to_hash() { a: 1 } end + assert_equal({a: 1}, m1(**o) {|x| break x}, bug9898) + o2 = Object.new + def o2.to_hash() { b: 2 } end + assert_equal({a: 1, b: 2}, m1(**o, **o2) {|x| break x}, bug9898) + end + def test_gced_object_in_stack bug8964 = '[ruby-dev:47729] [Bug #8964]' assert_normal_exit %q{ diff --git a/vm.c b/vm.c index ea138cc862..52e1f070bf 100644 --- a/vm.c +++ b/vm.c @@ -2357,6 +2357,7 @@ core_hash_merge_kwd(int argc, VALUE *argv) hash = argv[0]; kw = argv[argc-1]; kw = rb_convert_type(kw, T_HASH, "Hash", "to_hash"); + if (argc < 2) hash = kw; rb_hash_foreach(kw, argc < 2 ? kwcheck_i : kwmerge_i, hash); return hash; } -- cgit v1.2.3