[pypy-commit] pypy jitframe-on-heap: backout this for now until we figure out whats going on

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: jitframe-on-heap
Changeset: r61741:29698585f7f7
Date: 2013-02-24 20:38 +0200
http://bitbucket.org/pypy/pypy/changeset/29698585f7f7/

Log:	backout this for now until we figure out whats going on

diff --git a/rpython/jit/backend/x86/regalloc.py b/rpython/jit/backend/x86/regalloc.py
--- a/rpython/jit/backend/x86/regalloc.py
+++ b/rpython/jit/backend/x86/regalloc.py
@@ -300,18 +300,11 @@
             self.assembler.dump('%s <- %s(%s)' % (result_loc, op, arglocs))
         self.assembler.regalloc_perform_math(op, arglocs, result_loc)
 
-    def locs_for_fail(self, guard_op, no_regs=False):
-        r = []
-        for v in guard_op.getfailargs():
-            loc = self.loc(v)
-            if no_regs and loc is not None:
-                assert isinstance(loc, FrameLoc)
-            r.append(loc)
-        return r
+    def locs_for_fail(self, guard_op):
+        return [self.loc(v) for v in guard_op.getfailargs()]
 
-    def perform_with_guard(self, op, guard_op, arglocs, result_loc,
-                           no_regs=False):
-        faillocs = self.locs_for_fail(guard_op, no_regs=no_regs)
+    def perform_with_guard(self, op, guard_op, arglocs, result_loc):
+        faillocs = self.locs_for_fail(guard_op)
         self.rm.position += 1
         self.xrm.position += 1
         self.assembler.regalloc_perform_with_guard(op, guard_op, faillocs,
@@ -752,8 +745,7 @@
         else:
             resloc = None
         if guard_not_forced_op is not None:
-            self.perform_with_guard(op, guard_not_forced_op, arglocs, resloc,
-                                    no_regs=True)
+            self.perform_with_guard(op, guard_not_forced_op, arglocs, resloc)
         else:
             self.perform(op, arglocs, resloc)