Author: Armin Rigo <[email protected]>
Branch: stm-thread-2
Changeset: r59769:8eae75666f4a
Date: 2013-01-05 19:56 +0100
http://bitbucket.org/pypy/pypy/changeset/8eae75666f4a/
Log: hg merge default
diff --git a/pypy/jit/metainterp/resume.py b/pypy/jit/metainterp/resume.py
--- a/pypy/jit/metainterp/resume.py
+++ b/pypy/jit/metainterp/resume.py
@@ -1086,6 +1086,9 @@
def consume_virtualref_info(self, vrefinfo, numb, end):
# we have to decode a list of references containing pairs
# [..., virtual, vref, ...] stopping at 'end'
+ if vrefinfo is None:
+ assert end == 0
+ return
assert (end & 1) == 0
for i in range(0, end, 2):
virtual = self.decode_ref(numb.nums[i])
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
