[pypy-commit] pypy numpy-multidim: a better fix for test_zll_random

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: numpy-multidim
Changeset: r48493:52416083d855
Date: 2011-10-27 10:24 +0200
http://bitbucket.org/pypy/pypy/changeset/52416083d855/

Log:	a better fix for test_zll_random

diff --git a/pypy/jit/backend/llsupport/regalloc.py b/pypy/jit/backend/llsupport/regalloc.py
--- a/pypy/jit/backend/llsupport/regalloc.py
+++ b/pypy/jit/backend/llsupport/regalloc.py
@@ -178,8 +178,6 @@
         cur_max_age = -1
         candidate = None
         for next in self.reg_bindings:
-            if isinstance(next, TempBox):
-                continue
             reg = self.reg_bindings[next]
             if next in forbidden_vars:
                 continue
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
@@ -1050,7 +1050,7 @@
         tempvar = TempBox()
         index_loc = self.rm.force_result_in_reg(tempvar, op.getarg(1), args)
         # we're free to modify index now
-        value_loc = self.make_sure_var_in_reg(op.getarg(2), args,
+        value_loc = self.make_sure_var_in_reg(op.getarg(2), args + [tempvar],
                                               need_lower_byte=need_lower_byte)
         self.rm.possibly_free_var(tempvar)
         self.possibly_free_vars(args)