[pypy-svn] r63078 - pypy/branch/pyjitpl5/pypy/jit/metainterp

[arigo at codespeak.net]

Author: arigo
Date: Thu Mar 19 15:55:18 2009
New Revision: 63078

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py
Log:
Kill the const_if_fail hack.  It's not needed any more
because the value we "goto_if_not" on is typically not
passed further, so it won't appear in the liveboxes.


Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py	Thu Mar 19 15:55:18 2009
@@ -288,17 +288,14 @@
             targetpc = target
             targetenv = falselist
             opnum = rop.GUARD_TRUE
-            const_if_fail = history.CONST_FALSE
         else:
             currentpc = target
             currentenv = falselist
             targetpc = self.pc
             targetenv = truelist
             opnum = rop.GUARD_FALSE
-            const_if_fail = history.CONST_TRUE
         self.env = targetenv
-        self.generate_guard(targetpc, opnum, box, ignore_box=box,
-                                                  const_if_fail=const_if_fail)
+        self.generate_guard(targetpc, opnum, box)
         self.pc = currentpc
         self.env = currentenv
 
@@ -626,8 +623,7 @@
             if stop:
                 break
 
-    def generate_guard(self, pc, opnum, box, extraargs=[], ignore_box=None,
-                       const_if_fail=None):
+    def generate_guard(self, pc, opnum, box, extraargs=[]):
         if isinstance(box, Const):    # no need for a guard
             return
         if isinstance(self.metainterp.history, history.BlackHole):
@@ -636,11 +632,7 @@
         for frame in self.metainterp.framestack:
             for framebox in frame.env:
                 assert framebox is not None
-                if framebox is not ignore_box:
-                    liveboxes.append(framebox)
-                else:
-                    assert const_if_fail is not None
-                    liveboxes.append(const_if_fail)
+                liveboxes.append(framebox)
         if box is not None:
             extraargs = [box] + extraargs
         guard_op = self.metainterp.history.record(opnum, extraargs, None)
@@ -992,11 +984,6 @@
                                            exception_target)
         assert nbindex == len(newboxes), "too many newboxes!"
 
-    def record_compiled_merge_point(self, mp):
-        pass
-        #mplist = self.compiled_merge_points.setdefault(mp.greenkey, [])
-        #mplist.append(mp)
-
     def record_state(self):
         # XXX this whole function should do a sharing
         key = []