* bignum.c (rb_big2ull): fix 32bit platform breakage. we must

  not assume sizeof(VALUE) == sizeof(LONG_LONG).
* test/-ext-/num2int/test_num2int.rb (class TestNum2int):
  fix false assumption on 32bit platform.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 13 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 3bef371bc8..b9d1f32911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 14 14:54:17 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* bignum.c (rb_big2ull): fix 32bit platform breakage. we must
+	  not assume sizeof(VALUE) == sizeof(LONG_LONG).
+	* test/-ext-/num2int/test_num2int.rb (class TestNum2int):
+	  fix false assumption on 32bit platform.
+
 Mon Nov 14 14:52:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* numeric.c (rb_fix2ushort): fix typo. use num rb_num2ushort()
diff --git a/bignum.c b/bignum.c
index 91c275e605..7f47cf6efb 100644
--- a/bignum.c
+++ b/bignum.c
@@ -1258,10 +1258,10 @@ rb_big2ull(VALUE x)
     unsigned LONG_LONG num = big2ull(x, "unsigned long long");
 
     if (!RBIGNUM_SIGN(x)) {
-	VALUE v = (VALUE)(-(SIGNED_VALUE)num);
+	LONG_LONG v = -num;
 
 	/* FIXNUM_MIN-1 .. LLONG_MIN mapped into 0xbfffffffffffffff .. LONG_MAX+1 */
-	if (v <= LLONG_MAX)
+	if ((unsigned LONG_LONG)v <= LLONG_MAX)
 	    rb_raise(rb_eRangeError, "bignum out of range of unsigned long long");
 	return v;
     }
diff --git a/test/-ext-/num2int/test_num2int.rb b/test/-ext-/num2int/test_num2int.rb
index 6cdfc4c52d..381336e0c8 100644
--- a/test/-ext-/num2int/test_num2int.rb
+++ b/test/-ext-/num2int/test_num2int.rb
@@ -23,12 +23,10 @@ class TestNum2int < Test::Unit::TestCase
     LONG_MIN = -9223372036854775808
     ULONG_MAX = 18446744073709551615
   end
-  ULONG_HALF = ULONG_MAX - LONG_MAX
 
   LLONG_MAX = 9223372036854775807
   LLONG_MIN = -9223372036854775808
   ULLONG_MAX = 18446744073709551615
-  ULLONG_HALF = ULLONG_MAX - LLONG_MAX # 0x8000000000000000
 
   FIXNUM_MAX = LONG_MAX/2
   FIXNUM_MIN = LONG_MIN/2
@@ -151,10 +149,10 @@ class TestNum2int < Test::Unit::TestCase
     assert_raise(RangeError) do
       Num2int.print_num2ulong(ULONG_MAX+1)
     end
-    assert_output((ULONG_HALF+FIXNUM_MAX+1).to_s) do
+    assert_output((ULONG_MAX-FIXNUM_MAX).to_s) do
       Num2int.print_num2ulong(FIXNUM_MIN)
     end
-    assert_output((ULONG_HALF+FIXNUM_MAX).to_s) do
+    assert_output((ULONG_MAX-FIXNUM_MAX-1).to_s) do
       Num2int.print_num2ulong(FIXNUM_MIN-1)
     end
     assert_output(FIXNUM_MAX.to_s) do
@@ -211,10 +209,10 @@ class TestNum2int < Test::Unit::TestCase
     assert_raise(RangeError) do
       Num2int.print_num2ull(ULLONG_MAX+1)
     end
-    assert_output((ULLONG_HALF+FIXNUM_MAX+1).to_s) do
+    assert_output((ULLONG_MAX-FIXNUM_MAX).to_s) do
       Num2int.print_num2ull(FIXNUM_MIN)
     end
-    assert_output((ULLONG_HALF+FIXNUM_MAX).to_s) do
+    assert_output((ULLONG_MAX-FIXNUM_MAX-1).to_s) do
       Num2int.print_num2ull(FIXNUM_MIN-1)
     end
     assert_output(FIXNUM_MAX.to_s) do