Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r79987:d43a1b95f25c
Date: 2015-10-05 10:32 +0200
http://bitbucket.org/pypy/pypy/changeset/d43a1b95f25c/
Log: merge heads
diff --git a/rpython/jit/metainterp/resume.py b/rpython/jit/metainterp/resume.py
--- a/rpython/jit/metainterp/resume.py
+++ b/rpython/jit/metainterp/resume.py
@@ -26,19 +26,6 @@
self.prev = prev
self.boxes = boxes
- def copy(self, memo):
- try:
- return memo.snapshots[self]
- except KeyError:
- if self.prev is not None:
- prev = self.prev.copy(memo)
- else:
- prev = None
- boxes = [memo.get(box, box) for box in self.boxes]
- new_snapshot = Snapshot(prev, boxes)
- memo.snapshots[self] = new_snapshot
- return new_snapshot
-
class FrameInfo(object):
__slots__ = ('prev', 'jitcode', 'pc')
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
