From c8010fcec016ee89aa0c45fe31094b2db0023e5c Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Mon, 28 Dec 2020 01:38:17 +0900
Subject: [PATCH] Dup kwrest hash when merging other keyword arguments [Bug
 #17481]

---
 compile.c                 |  4 ++++
 test/ruby/test_keyword.rb | 25 ++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/compile.c b/compile.c
index 264c310012..370a1f4522 100644
--- a/compile.c
+++ b/compile.c
@@ -8157,6 +8157,10 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in
 		if (local_body->param.flags.has_kwrest) {
 		    int idx = local_body->local_table_size - local_kwd->rest_start;
 		    ADD_GETLOCAL(args, line, idx, lvar_level);
+                    if (local_kwd->num > 0) {
+                        ADD_SEND(args, line, rb_intern("dup"), INT2FIX(0));
+                        flag |= VM_CALL_KW_SPLAT_MUT;
+                    }
 		}
 		else {
 		    ADD_INSN1(args, line, newhash, INT2FIX(0));
diff --git a/test/ruby/test_keyword.rb b/test/ruby/test_keyword.rb
index 8ec0636d5c..de367e6a30 100644
--- a/test/ruby/test_keyword.rb
+++ b/test/ruby/test_keyword.rb
@@ -3681,6 +3681,25 @@ class TestKeywordArguments < Test::Unit::TestCase
     assert_equal([42, {:bar=>"x"}], b.new.foo(42), bug8236)
   end
 
+  def test_super_with_keyword_kwrest
+    base = Class.new do
+      def foo(**h)
+        h
+      end
+    end
+    a = Class.new(base) do
+      attr_reader :h
+      def foo(a:, b:, **h)
+        @h = h
+        super
+      end
+    end
+
+    o = a.new
+    assert_equal({a: 1, b: 2, c: 3}, o.foo(a: 1, b: 2, c: 3))
+    assert_equal({c: 3}, o.h)
+  end
+
   def test_zsuper_only_named_kwrest
     bug8416 = '[ruby-core:55033] [Bug #8416]'
     base = Class.new do
@@ -3689,11 +3708,15 @@ class TestKeywordArguments < Test::Unit::TestCase
       end
     end
     a = Class.new(base) do
+      attr_reader :h
       def foo(**h)
+        @h = h
         super
       end
     end
-    assert_equal({:bar=>"x"}, a.new.foo(bar: "x"), bug8416)
+    o = a.new
+    assert_equal({:bar=>"x"}, o.foo(bar: "x"), bug8416)
+    assert_equal({:bar=>"x"}, o.h)
   end
 
   def test_zsuper_only_anonymous_kwrest