[pypy-commit] pypy jit-short_from_state: hg merge default

hakanardo noreply at buildbot.pypy.org
Mon Jun 20 07:22:13 CEST 2011


Author: Hakan Ardo <hakan at 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(


More information about the pypy-commit mailing list