[pypy-commit] pypy heapcache-refactor: fixes

[fijal]

Author: fijal
Branch: heapcache-refactor
Changeset: r83162:d1552513a12b
Date: 2016-03-19 10:54 +0200
http://bitbucket.org/pypy/pypy/changeset/d1552513a12b/

Log:	fixes

diff --git a/rpython/jit/backend/llgraph/runner.py b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgraph/runner.py
+++ b/rpython/jit/backend/llgraph/runner.py
@@ -455,7 +455,7 @@
                 if box is not frame.current_op:
                     value = frame.env[box]
                 else:
-                    value = box.getvalue()    # 0 or 0.0 or NULL
+                    value = 0 # box.getvalue()    # 0 or 0.0 or NULL
             else:
                 value = None
             values.append(value)
diff --git a/rpython/jit/metainterp/history.py b/rpython/jit/metainterp/history.py
--- a/rpython/jit/metainterp/history.py
+++ b/rpython/jit/metainterp/history.py
@@ -715,7 +715,7 @@
     @specialize.argtype(3)
     def record(self, opnum, argboxes, value, descr=None):
         if self.trace is None:
-            pos = -1
+            pos = 2**14 - 1
         else:
             pos = self.trace.record_op(opnum, argboxes, descr)
         if value is None:
diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -2822,7 +2822,7 @@
         self.history.record_nospec(rop.VIRTUAL_REF_FINISH,
                             [vrefbox, virtualbox], None)
         newop = self.history.record_nospec(opnum, arglist, descr)
-        op.position = newop.position
+        op.set_position(newop.get_position())
         # mark by replacing it with ConstPtr(NULL)
         self.virtualref_boxes[i+1] = self.cpu.ts.CONST_NULL