[pypy-svn] r62922 - pypy/branch/pyjitpl5/pypy/jit/backend/x86

[fijal at codespeak.net]

Author: fijal
Date: Fri Mar 13 01:35:00 2009
New Revision: 62922

Modified:
   pypy/branch/pyjitpl5/pypy/jit/backend/x86/regalloc.py
Log:
a trivial fix after couple hours of fight with tools. progress I suppose


Modified: pypy/branch/pyjitpl5/pypy/jit/backend/x86/regalloc.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/backend/x86/regalloc.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/backend/x86/regalloc.py	Fri Mar 13 01:35:00 2009
@@ -486,6 +486,7 @@
     def consider_merge_point(self, op, ignored):
         # XXX we can sort out here by longevity if we need something
         # more optimal
+
         ops = [PerformDiscard(op, [])]
         locs = [None] * len(op.args)
         for i in range(len(op.args)):
@@ -707,7 +708,7 @@
             isinstance(vx, Const) or isinstance(vy, Const)):
             ops0 = []
         else:
-            arglocs[0], ops0 = self.force_allocate_reg(vx, [])
+            arglocs[0], ops0 = self.make_sure_var_in_reg(vx, [])
         self.eventually_free_var(vx)
         self.eventually_free_var(vy)
         if guard_op is None: