[pypy-commit] pypy disable_merge_different_int_types: (arigo, bivab): fix

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: disable_merge_different_int_types
Changeset: r49687:fe6b9886d517
Date: 2011-11-23 14:58 +0100
http://bitbucket.org/pypy/pypy/changeset/fe6b9886d517/

Log:	(arigo, bivab): fix

diff --git a/pypy/rlib/rbigint.py b/pypy/rlib/rbigint.py
--- a/pypy/rlib/rbigint.py
+++ b/pypy/rlib/rbigint.py
@@ -1790,7 +1790,7 @@
     i = v.numdigits() - 1
     while i >= 0:
         prev = x
-        x = (x << SHIFT) + v.widedigit(i)
+        x = (x << SHIFT) + r_ulonglong(v.widedigit(i))
         if (x >> SHIFT) != prev:
                 raise OverflowError(
                     "long int too large to convert to unsigned long long int")