ruby-changes:50683
From: nagachika <ko1@a...>
Date: Tue, 20 Mar 2018 02:30:24 +0900 (JST)
Subject: [ruby-changes:50683] nagachika:r62849 (ruby_2_4): merge revision(s) 61413: [Backport #14218]
nagachika 2018-03-20 02:30:19 +0900 (Tue, 20 Mar 2018) New Revision: 62849 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62849 Log: merge revision(s) 61413: [Backport #14218] force hash values fixable * include/ruby/ruby.h (RB_ST2FIX): force fixable on LLP64 environment. * hash.c (any_hash): ditto. [ruby-core:84395] [Bug #14218] Modified directories: branches/ruby_2_4/ Modified files: branches/ruby_2_4/hash.c branches/ruby_2_4/include/ruby/ruby.h branches/ruby_2_4/test/ruby/test_hash.rb branches/ruby_2_4/version.h Index: ruby_2_4/hash.c =================================================================== --- ruby_2_4/hash.c (revision 62848) +++ ruby_2_4/hash.c (revision 62849) @@ -198,8 +198,16 @@ any_hash(VALUE a, st_index_t (*other_fun https://github.com/ruby/ruby/blob/trunk/ruby_2_4/hash.c#L198 hnum = other_func(a); } out: +#if SIZEOF_LONG < SIZEOF_ST_INDEX_T + if (hnum > 0) + hnum &= (unsigned long)-1 >> 2; + else + hnum |= ~((unsigned long)-1 >> 2); +#else hnum <<= 1; - return (long)RSHIFT(hnum, 1); + hnum = RSHIFT(hnum, 1); +#endif + return (long)hnum; } static st_index_t Index: ruby_2_4/version.h =================================================================== --- ruby_2_4/version.h (revision 62848) +++ ruby_2_4/version.h (revision 62849) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1 #define RUBY_VERSION "2.4.4" #define RUBY_RELEASE_DATE "2018-03-20" -#define RUBY_PATCHLEVEL 268 +#define RUBY_PATCHLEVEL 269 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 3 Index: ruby_2_4/test/ruby/test_hash.rb =================================================================== --- ruby_2_4/test/ruby/test_hash.rb (revision 62848) +++ ruby_2_4/test/ruby/test_hash.rb (revision 62849) @@ -1497,6 +1497,13 @@ class TestHash < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/ruby/test_hash.rb#L1497 assert_equal(%w(1.0 2.1 3.2), y.values_at(:a, :b, :c)) end + def test_broken_hash_value + bug14218 = '[ruby-core:84395] [Bug #14218]' + + assert_equal(0, 1_000_000.times.count{a=Object.new.hash; b=Object.new.hash; a < 0 && b < 0 && a + b > 0}, bug14218) + assert_equal(0, 1_000_000.times.count{a=Object.new.hash; b=Object.new.hash; 0 + a + b != 0 + b + a}, bug14218) + end + class TestSubHash < TestHash class SubHash < Hash def reject(*) Index: ruby_2_4/include/ruby/ruby.h =================================================================== --- ruby_2_4/include/ruby/ruby.h (revision 62848) +++ ruby_2_4/include/ruby/ruby.h (revision 62849) @@ -1575,7 +1575,11 @@ rb_num2char_inline(VALUE x) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/include/ruby/ruby.h#L1575 #define NUM2CHR(x) RB_NUM2CHR(x) #define CHR2FIX(x) RB_CHR2FIX(x) +#if SIZEOF_LONG < SIZEOF_VALUE +#define RB_ST2FIX(h) RB_LONG2FIX((long)((h) > 0 ? (h) & (unsigned long)-1 >> 2 : (h) | ~((unsigned long)-1 >> 2))) +#else #define RB_ST2FIX(h) RB_LONG2FIX((long)(h)) +#endif #define ST2FIX(h) RB_ST2FIX(h) #define RB_ALLOC_N(type,n) ((type*)ruby_xmalloc2((size_t)(n),sizeof(type))) Index: ruby_2_4 =================================================================== --- ruby_2_4 (revision 62848) +++ ruby_2_4 (revision 62849) Property changes on: ruby_2_4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r61413 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/