merge revision(s) 51190: [Backport #11338]

	* iseq.c (iseq_data_to_ary): dump kw_arg as symbol

	* test/-ext-/iseq_load/test_iseq_load.rb: test kw_arg roundtrip
	  [ruby-core:69891] [Bug #11338]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 17 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3dc691be9c..ca8a0440e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Nov 29 16:11:32 2015  Eric Wong  <e@80x24.org>
+
+	* iseq.c (iseq_data_to_ary): dump kw_arg as symbol
+	* test/-ext-/iseq_load/test_iseq_load.rb: test kw_arg roundtrip
+	  [ruby-core:69891] [Bug #11338]
+
 Sun Nov 29 02:55:56 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* gc.c (__has_feature): move into internal.h.
diff --git a/iseq.c b/iseq.c
index 9cf5df66a0..abd29e8865 100644
--- a/iseq.c
+++ b/iseq.c
@@ -1834,7 +1834,7 @@ iseq_data_to_ary(rb_iseq_t *iseq)
 
 			orig_argc -= ci->kw_arg->keyword_len;
 			for (i = 0; i < ci->kw_arg->keyword_len; i++) {
-			    rb_ary_push(kw, ID2SYM(ci->kw_arg->keywords[i]));
+			    rb_ary_push(kw, ci->kw_arg->keywords[i]);
 			}
 			rb_hash_aset(e, ID2SYM(rb_intern("kw_arg")), kw);
 		    }
diff --git a/test/-ext-/iseq_load/test_iseq_load.rb b/test/-ext-/iseq_load/test_iseq_load.rb
index 5bbd49efba..e6cb0ff5c4 100644
--- a/test/-ext-/iseq_load/test_iseq_load.rb
+++ b/test/-ext-/iseq_load/test_iseq_load.rb
@@ -74,6 +74,15 @@ class TestIseqLoad < Test::Unit::TestCase
     end;
   end
 
+  def test_kwarg
+    assert_iseq_roundtrip <<-'end;'
+      def foo(kwarg: :foo)
+        kwarg
+      end
+      foo(kwarg: :bar)
+    end;
+  end
+
   # FIXME: still failing
   def test_require_integration
     skip "iseq loader require integration tests still failing"
diff --git a/version.h b/version.h
index be0140acc2..278c227952 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.4"
 #define RUBY_RELEASE_DATE "2015-11-29"
-#define RUBY_PATCHLEVEL 208
+#define RUBY_PATCHLEVEL 209
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 11