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

1 files changed, 11 insertions, 0 deletions

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{