[pypy-commit] pypy default: merge

[cfbolz]

Author: Carl Friedrich Bolz <cfb...@gmx.de>
Branch: 
Changeset: r62549:9b711f742ce4
Date: 2013-03-20 16:41 +0100
http://bitbucket.org/pypy/pypy/changeset/9b711f742ce4/

Log:    merge

diff --git a/rpython/jit/metainterp/optimizeopt/heap.py 
b/rpython/jit/metainterp/optimizeopt/heap.py
--- a/rpython/jit/metainterp/optimizeopt/heap.py
+++ b/rpython/jit/metainterp/optimizeopt/heap.py
@@ -172,17 +172,17 @@
         self._lazy_setfields_and_arrayitems = []
         self._remove_guard_not_invalidated = False
         self._seen_guard_not_invalidated = False
-        self.posponedop = None
+        self.postponed_op = None
 
     def force_at_end_of_preamble(self):
         self.force_all_lazy_setfields_and_arrayitems()
 
     def flush(self):
         self.force_all_lazy_setfields_and_arrayitems()
-        if self.posponedop:
-            posponedop = self.posponedop
-            self.posponedop = None
-            self.next_optimization.propagate_forward(posponedop)
+        if self.postponed_op:
+            postponed_op = self.postponed_op
+            self.postponed_op = None
+            self.next_optimization.propagate_forward(postponed_op)
 
     def new(self):
         return OptHeap()
@@ -230,13 +230,13 @@
 
     def emit_operation(self, op):
         self.emitting_operation(op)
-        if self.posponedop:
-            posponedop = self.posponedop
-            self.posponedop = None
-            self.next_optimization.propagate_forward(posponedop)
+        if self.postponed_op:
+            postponed_op = self.postponed_op
+            self.postponed_op = None
+            self.next_optimization.propagate_forward(postponed_op)
         if (op.is_comparison() or op.getopnum() == rop.CALL_MAY_FORCE
             or op.is_ovf()):
-            self.posponedop = op
+            self.postponed_op = op
         else:
             Optimization.emit_operation(self, op)
 
diff --git a/rpython/jit/metainterp/optimizeopt/pure.py 
b/rpython/jit/metainterp/optimizeopt/pure.py
--- a/rpython/jit/metainterp/optimizeopt/pure.py
+++ b/rpython/jit/metainterp/optimizeopt/pure.py
@@ -5,7 +5,7 @@
 
 class OptPure(Optimization):
     def __init__(self):
-        self.posponedop = None
+        self.postponed_op = None
         self.pure_operations = args_dict()
         self.emitted_pure_operations = {}
 
@@ -15,12 +15,12 @@
     def optimize_default(self, op):
         canfold = op.is_always_pure()
         if op.is_ovf():
-            self.posponedop = op
+            self.postponed_op = op
             return
-        if self.posponedop:
+        if self.postponed_op:
             nextop = op
-            op = self.posponedop
-            self.posponedop = None
+            op = self.postponed_op
+            self.postponed_op = None
             canfold = nextop.getopnum() == rop.GUARD_NO_OVERFLOW
         else:
             nextop = None
@@ -83,10 +83,10 @@
         self.emit_operation(op)
 
     def flush(self):
-        assert self.posponedop is None
+        assert self.postponed_op is None
 
     def new(self):
-        assert self.posponedop is None
+        assert self.postponed_op is None
         return OptPure()
 
     def setup(self):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit