merge revision(s) 59128: [Backport #13669]

nagachika · nagachika · commit 90645fd4371a · 2017-08-05T03:24:54.000Z
Fix Enumerable#uniq with non single yield arguments * enum.c (uniq_func, uniq_iter): need packed value as the unique key. [ruby-core:81734] [Bug #13669] [Fix rubyGH-1658] Author: Kenichi Kamiya <kachick1@gmail.com> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/enum.c b/enum.c
@@ -3847,13 +3847,15 @@ enum_sum(int argc, VALUE* argv, VALUE obj)
 static VALUE
 uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
 {
+    ENUM_WANT_SVALUE();
     rb_hash_add_new_element(hash, i, i);
     return Qnil;
 }
 
 static VALUE
 uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
 {
+    ENUM_WANT_SVALUE();
     rb_hash_add_new_element(hash, rb_yield_values2(argc, argv), i);
     return Qnil;
 }
diff --git a/test/ruby/test_enum.rb b/test/ruby/test_enum.rb
@@ -946,5 +946,6 @@ def test_uniq
     assert_equal([[1896, "Athens"], [1900, "Paris"], [1904, "Chicago"], [1908, "Rome"]],
                  olympics.uniq{|k,v| v})
     assert_equal([1, 2, 3, 4, 5, 10], (1..100).uniq{|x| (x**2) % 10 }.first(6))
+    assert_equal([1, [1, 2]], Foo.new.to_enum.uniq)
   end
 end
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.4.2"
 #define RUBY_RELEASE_DATE "2017-08-05"
-#define RUBY_PATCHLEVEL 178
+#define RUBY_PATCHLEVEL 179
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 8

Original file line number	Diff line number	Diff line change
`@@ -3847,13 +3847,15 @@ enum_sum(int argc, VALUE* argv, VALUE obj)`
`3847`	`3847`	`static VALUE`
`3848`	`3848`	`uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))`
`3849`	`3849`	`{`
	`3850`	`+ ENUM_WANT_SVALUE();`
`3850`	`3851`	`rb_hash_add_new_element(hash, i, i);`
`3851`	`3852`	`return Qnil;`
`3852`	`3853`	`}`
`3853`	`3854`
`3854`	`3855`	`static VALUE`
`3855`	`3856`	`uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))`
`3856`	`3857`	`{`
	`3858`	`+ ENUM_WANT_SVALUE();`
`3857`	`3859`	`rb_hash_add_new_element(hash, rb_yield_values2(argc, argv), i);`
`3858`	`3860`	`return Qnil;`
`3859`	`3861`	`}`