summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-22 08:52:11 (GMT)
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-22 08:52:11 (GMT)
commit52220154a8310d0140829daa1de665003bb11dec (patch)
tree88573f478ccd41c18c42c1b7900c9e02b6400d96
parent072ed558d5b27f484ba4fb65f5e778ffad54d951 (diff)
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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61413 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--hash.c10
-rw-r--r--include/ruby/ruby.h4
-rw-r--r--test/ruby/test_hash.rb7
3 files changed, 20 insertions, 1 deletions
diff --git a/hash.c b/hash.c
index 627f207..1bbb6b1 100644
--- a/hash.c
+++ b/hash.c
@@ -193,8 +193,16 @@ any_hash(VALUE a, st_index_t (*other_func)(VALUE))
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
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 0959413..56aca0d 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1575,7 +1575,11 @@ rb_num2char_inline(VALUE x)
#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)))
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
index ea19ba8..4223aa8 100644
--- a/test/ruby/test_hash.rb
+++ b/test/ruby/test_hash.rb
@@ -1596,6 +1596,13 @@ class TestHash < Test::Unit::TestCase
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(*)