Author: Hakan Ardo <[email protected]>
Branch: jit-opaque-licm
Changeset: r56302:6b8109e23fc3
Date: 2012-07-21 08:43 +0200
http://bitbucket.org/pypy/pypy/changeset/6b8109e23fc3/

Log:    merge default

diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -18,6 +18,8 @@
 .. branch: numpypy_count_nonzero
 .. branch: even-more-jit-hooks
 Implement better JIT hooks
+.. branch: virtual-arguments
+Improve handling of **kwds greatly, making them virtual sometimes.
 
 .. "uninteresting" branches that we should just ignore for the whatsnew:
 .. branch: slightly-shorter-c
diff --git a/pypy/jit/backend/x86/regalloc.py b/pypy/jit/backend/x86/regalloc.py
--- a/pypy/jit/backend/x86/regalloc.py
+++ b/pypy/jit/backend/x86/regalloc.py
@@ -1189,7 +1189,7 @@
     consider_cast_int_to_ptr = consider_same_as
 
     def consider_int_force_ge_zero(self, op):
-        argloc = self.loc(op.getarg(0))
+        argloc = self.make_sure_var_in_reg(op.getarg(0))
         resloc = self.force_allocate_reg(op.result, [op.getarg(0)])
         self.possibly_free_var(op.getarg(0))
         self.Perform(op, [argloc], resloc)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to