Author: Hakan Ardo <ha...@debian.org>
Branch: jit-short_from_state
Changeset: r45028:cad42ef78cfb
Date: 2011-06-20 07:25 +0200
http://bitbucket.org/pypy/pypy/changeset/cad42ef78cfb/
Log: hg merge default
diff --git a/pypy/module/pypyjit/interp_resop.py
b/pypy/module/pypyjit/interp_resop.py
--- a/pypy/module/pypyjit/interp_resop.py
+++ b/pypy/module/pypyjit/interp_resop.py
@@ -29,6 +29,7 @@
llcode = lltype.cast_opaque_ptr(lltype.Ptr(OBJECT),
boxes[4].getref_base())
pycode = cast_base_ptr_to_instance(PyCode, llcode)
+ assert pycode is not None
return W_DebugMergePoint(mp_no, offset, pycode)
W_DebugMergePoint.typedef = TypeDef(
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
