[pypy-commit] pypy jit-short_from_state: fixed merge messups

hakanardo noreply at buildbot.pypy.org
Sun Jun 19 17:32:47 CEST 2011


Author: Hakan Ardo <hakan at debian.org>
Branch: jit-short_from_state
Changeset: r45007:7765ed99f5e1
Date: 2011-06-19 17:36 +0200
http://bitbucket.org/pypy/pypy/changeset/7765ed99f5e1/

Log:	fixed merge messups

diff --git a/pypy/jit/metainterp/optimizeopt/intbounds.py b/pypy/jit/metainterp/optimizeopt/intbounds.py
--- a/pypy/jit/metainterp/optimizeopt/intbounds.py
+++ b/pypy/jit/metainterp/optimizeopt/intbounds.py
@@ -25,10 +25,6 @@
         self.posponedop = None
         self.nextop = None
 
-    def reconstruct_for_next_iteration(self, optimizer, valuemap):
-        assert self.posponedop is None
-        return self 
-        
     def propagate_forward(self, op):
         if op.is_ovf():
             self.posponedop = op
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py b/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py
@@ -62,6 +62,8 @@
         boxes = []
     def clone_if_mutable(self):
         return self
+    def __eq__(self, other):
+        return isinstance(other, Storage) or isinstance(other, FakeDescr)
 
 
 class BaseTestWithUnroll(BaseTest):
@@ -80,8 +82,6 @@
         loop.preamble = TreeLoop('preamble')
         loop.preamble.inputargs = loop.inputargs
         loop.preamble.token = LoopToken()
-            def __eq__(self, other):
-                return isinstance(other, Storage) or isinstance(other, FakeDescr)
         loop.preamble.start_resumedescr = FakeDescr()
         #
         self._do_optimize_loop(loop, call_pure_results)
diff --git a/pypy/jit/metainterp/optimizeopt/virtualstate.py b/pypy/jit/metainterp/optimizeopt/virtualstate.py
--- a/pypy/jit/metainterp/optimizeopt/virtualstate.py
+++ b/pypy/jit/metainterp/optimizeopt/virtualstate.py
@@ -6,7 +6,7 @@
                                                       LEVEL_UNKNOWN, \
                                                       MININT, MAXINT, OptValue
 from pypy.jit.metainterp.history import BoxInt, ConstInt, BoxPtr, Const
-from pypy.jit.metainterp.optimizeutil import InvalidLoop
+from pypy.jit.metainterp.optimize import InvalidLoop
 from pypy.jit.metainterp.optimizeopt.intutils import IntBound, IntUnbounded
 from pypy.jit.metainterp.resoperation import rop, ResOperation
 from pypy.rlib.objectmodel import we_are_translated


More information about the pypy-commit mailing list