[pypy-commit] pypy jit-leaner-frontend: fix the merge

[fijal]

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82659:0c113541c860
Date: 2016-03-01 14:07 +0100
http://bitbucket.org/pypy/pypy/changeset/0c113541c860/

Log:	fix the merge

diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -58,7 +58,7 @@
             box = self._get(self._next())
             assert box
             box_list.append(box)
-        op.rd_snapshot = resume.Snapshot(None, box_list)
+        op.rd_snapshot = resume.TopSnapshot(resume.Snapshot(None, box_list), [], [])
 
     def next(self):
         opnum = self._next()
diff --git a/rpython/jit/metainterp/test/test_opencoder.py b/rpython/jit/metainterp/test/test_opencoder.py
--- a/rpython/jit/metainterp/test/test_opencoder.py
+++ b/rpython/jit/metainterp/test/test_opencoder.py
@@ -49,11 +49,11 @@
         add = t.record_op(rop.INT_ADD, [i0, i1])
         t.record_op(rop.GUARD_FALSE, [add])
         # now we write rd_snapshot and friends
-        virtualizable_boxes = []
+        virtualizable_boxes = None
         virutalref_boxes = []
         framestack = [FakeFrame(1, JitCode(2), [i0, i1])]
         resume.capture_resumedata(framestack, virtualizable_boxes,
                                   virutalref_boxes, t)
         (i0, i1), l = self.unpack(t)
         assert l[1].opnum == rop.GUARD_FALSE
-        assert l[1].rd_snapshot.boxes == [i0, i1]
+        assert l[1].rd_snapshot.prev.boxes == [i0, i1]