shyouhei	2009-12-14 02:48:12 +0900 (Mon, 14 Dec 2009)

  New Revision: 26081

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26081

  Log:
    merge revision(s) 25659:25661:
    * hash.c (rb_hash): always return a fixnum value because a return
      value of rb_hash may be used as a hash value itself and bignums have
      no unique VALUE.
    * test/ruby/test_hash.rb: add a test for above.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/hash.c
    branches/ruby_1_8_7/test/ruby/test_hash.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/hash.c
===================================================================
--- ruby_1_8_7/hash.c	(revision 26080)
+++ ruby_1_8_7/hash.c	(revision 26081)
@@ -81,7 +81,19 @@
 rb_hash(obj)
     VALUE obj;
 {
-    return rb_funcall(obj, id_hash, 0);
+    VALUE hval = rb_funcall(obj, id_hash, 0);
+  retry:
+    switch (TYPE(hval)) {
+      case T_FIXNUM:
+	return hval;
+
+      case T_BIGNUM:
+	return LONG2FIX(((long*)(RBIGNUM_DIGITS(hval)))[0]);
+
+      default:
+	hval = rb_to_int(hval);
+	goto retry;
+    }
 }
 
 static int
@@ -102,10 +114,7 @@
 	break;
 
       default:
-	hval = rb_funcall(a, id_hash, 0);
-	if (!FIXNUM_P(hval)) {
-	    hval = rb_funcall(hval, '%', 1, INT2FIX(536870923));
-	}
+        hval = rb_hash(a);
 	hnum = (int)FIX2LONG(hval);
     }
     hnum <<= 1;
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 26080)
+++ ruby_1_8_7/ChangeLog	(revision 26081)
@@ -1,3 +1,11 @@
+Mon Dec 14 02:27:32 2009  Yusuke Endoh  <mame@t...>
+
+	* hash.c (rb_hash): always return a fixnum value because a return
+	  value of rb_hash may be used as a hash value itself and bignums have
+	  no unique VALUE.
+
+	* test/ruby/test_hash.rb: add a test for above.
+
 Mon Dec 14 00:42:55 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_str_inspect): get rid of adding garbage to shor
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 26080)
+++ ruby_1_8_7/version.h	(revision 26081)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-12-14"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091214
-#define RUBY_PATCHLEVEL 227
+#define RUBY_PATCHLEVEL 228
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/test/ruby/test_hash.rb
===================================================================
--- ruby_1_8_7/test/ruby/test_hash.rb	(revision 26080)
+++ ruby_1_8_7/test/ruby/test_hash.rb	(revision 26081)
@@ -638,4 +638,15 @@
   def test_hash_hash
     assert_equal({0=>2,11=>1}.hash, {11=>1,0=>2}.hash)
   end
+
+  def test_hash_bignum_hash
+    x = 2<<(32-3)-1
+    assert_equal({x=>1}.hash, {x=>1}.hash)
+    x = 2<<(64-3)-1
+    assert_equal({x=>1}.hash, {x=>1}.hash)
+
+    o = Object.new
+    def o.hash; 2<<100; end
+    assert_equal({x=>1}.hash, {x=>1}.hash)
+  end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/