[pypy-commit] pypy disable_merge_different_int_types: (bivab, arigo) Bah, undo this, which was too much.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: disable_merge_different_int_types
Changeset: r49960:82c99d032cfc
Date: 2011-11-29 14:23 +0100
http://bitbucket.org/pypy/pypy/changeset/82c99d032cfc/

Log:	(bivab, arigo) Bah, undo this, which was too much.

diff --git a/pypy/jit/codewriter/support.py b/pypy/jit/codewriter/support.py
--- a/pypy/jit/codewriter/support.py
+++ b/pypy/jit/codewriter/support.py
@@ -347,7 +347,7 @@
 
 def _ll_2_llong_lshift(xll, y):
     z = r_ulonglong(xll) << y
-    return (z)
+    return u_to_longlong(z)
 
 def _ll_2_ullong_lshift(xull, y):
     return xull << y