[pypy-svn] pypy jitypes2: merge heads (in practice, this "discards" the previous broken merge of rev 573c1b00e6c4)

antocuni commits-noreply at bitbucket.org
Tue Jan 11 10:39:34 CET 2011


Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: jitypes2
Changeset: r40574:c41e0e45f894
Date: 2011-01-11 10:32 +0100
http://bitbucket.org/pypy/pypy/changeset/c41e0e45f894/

Log:	merge heads (in practice, this "discards" the previous broken merge
	of rev 573c1b00e6c4)

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
@@ -17,6 +17,14 @@
         assert self.posponedop is None
         return self 
 
+    def setup(self):
+        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



More information about the Pypy-commit mailing list