[pypy-commit] pypy jitframe-on-heap: some paranoia

fijal noreply at buildbot.pypy.org
Sat Feb 23 13:33:49 CET 2013


Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: jitframe-on-heap
Changeset: r61664:7a646f691e22
Date: 2013-02-23 14:32 +0200
http://bitbucket.org/pypy/pypy/changeset/7a646f691e22/

Log:	some paranoia

diff --git a/rpython/jit/backend/llsupport/llmodel.py b/rpython/jit/backend/llsupport/llmodel.py
--- a/rpython/jit/backend/llsupport/llmodel.py
+++ b/rpython/jit/backend/llsupport/llmodel.py
@@ -92,6 +92,7 @@
                 new_frame.jf_frame[i] = frame.jf_frame[i]
                 i += 1
             new_frame.jf_savedata = frame.jf_savedata
+            new_frame.jf_guard_exc = frame.jf_guard_exc
             # all other fields are empty
             llop.gc_assume_young_pointers(lltype.Void, new_frame)
             return lltype.cast_opaque_ptr(llmemory.GCREF, new_frame)
diff --git a/rpython/rtyper/lltypesystem/rdict.py b/rpython/rtyper/lltypesystem/rdict.py
--- a/rpython/rtyper/lltypesystem/rdict.py
+++ b/rpython/rtyper/lltypesystem/rdict.py
@@ -526,7 +526,6 @@
 
 @jit.look_inside_iff(lambda d, i: jit.isvirtual(d) and jit.isconstant(i))
 def _ll_dict_del(d, i):
-    assert i >= 0
     d.entries.mark_deleted(i)
     d.num_items -= 1
     # clear the key and the value if they are GC pointers


More information about the pypy-commit mailing list