Author: Hakan Ardo <[email protected]>
Branch: jit-short_from_state
Changeset: r45210:47aed66223f9
Date: 2011-06-30 19:38 +0200
http://bitbucket.org/pypy/pypy/changeset/47aed66223f9/
Log: complete merge without support for heap operations in the short
preamble
diff --git a/pypy/jit/metainterp/optimizeopt/heap.py
b/pypy/jit/metainterp/optimizeopt/heap.py
--- a/pypy/jit/metainterp/optimizeopt/heap.py
+++ b/pypy/jit/metainterp/optimizeopt/heap.py
@@ -117,13 +117,16 @@
self._remove_guard_not_invalidated = False
self._seen_guard_not_invalidated = False
- def reconstruct_for_next_iteration(self, optimizer, valuemap):
+ def force_at_end_of_preamble(self):
+ self.force_all_lazy_setfields_and_arrayitems()
+
+ def flush(self):
+ self.force_all_lazy_setfields_and_arrayitems()
+
+ def reconstruct_for_next_iteration(self, short_boxes, surviving_boxes,
+ optimizer, valuemap):
new = OptHeap()
-
- if True:
- self.force_all_lazy_setfields_and_arrayitems()
- else:
- assert 0 # was: new.lazy_setfields = self.lazy_setfields
+ return new
for descr, d in self.cached_fields.items():
new.cached_fields[descr] = d.get_reconstructed(optimizer, valuemap)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
