naruse	2009-11-05 21:22:24 +0900 (Thu, 05 Nov 2009)

  New Revision: 25661

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

  Log:
    Merged r22308. [ruby-dev:39637]
    
    * 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/ChangeLog
    branches/ruby_1_8/gc.c
    branches/ruby_1_8/hash.c
    branches/ruby_1_8/test/ruby/test_hash.rb

Index: ruby_1_8/hash.c
===================================================================
--- ruby_1_8/hash.c	(revision 25660)
+++ ruby_1_8/hash.c	(revision 25661)
@@ -83,7 +83,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
@@ -104,10 +116,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/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 25660)
+++ ruby_1_8/ChangeLog	(revision 25661)
@@ -1,9 +1,11 @@
-Thu Nov  5 20:49:47 2009  NARUSE, Yui  <naruse@r...>
+Sun Feb 15 03:50:21 2009  Yusuke Endoh  <mame@t...>
 
-	* gc.c (rb_obj_id): a Fixnum which is beyond signed long
-	  was converted to a Bignum in calculating its hash.
-	  [ruby-dev:39637]
+	* 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.
+
 Thu Nov  5 12:06:35 2009  NARUSE, Yui  <naruse@r...>
 
 	* parse.y (args): use splat_array.
Index: ruby_1_8/test/ruby/test_hash.rb
===================================================================
--- ruby_1_8/test/ruby/test_hash.rb	(revision 25660)
+++ ruby_1_8/test/ruby/test_hash.rb	(revision 25661)
@@ -637,7 +637,16 @@
 
   def test_hash_hash
     assert_equal({0=>2,11=>1}.hash, {11=>1,0=>2}.hash)
-    assert_equal({:a=>2**29}.hash, {:a=>2**29}.hash)
-    assert_equal({:a=>2**61}.hash, {:a=>2**61}.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
Index: ruby_1_8/gc.c
===================================================================
--- ruby_1_8/gc.c	(revision 25660)
+++ ruby_1_8/gc.c	(revision 25661)
@@ -2142,7 +2142,7 @@
         return (SYM2ID(obj) * sizeof(RVALUE) + (4 << 2)) | FIXNUM_FLAG;
     }
     if (SPECIAL_CONST_P(obj)) {
-        return LONG2FIX((long)obj);
+        return LONG2NUM((long)obj);
     }
     return (VALUE)((long)obj|FIXNUM_FLAG);
 }

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