Author: Armin Rigo <ar...@tunes.org>
Branch: all_ordered_dicts
Changeset: r74959:5cefc7e504a8
Date: 2014-12-16 17:42 +0100
http://bitbucket.org/pypy/pypy/changeset/5cefc7e504a8/
Log: hg merge default
diff --git a/rpython/rtyper/lltypesystem/rordereddict.py
b/rpython/rtyper/lltypesystem/rordereddict.py
--- a/rpython/rtyper/lltypesystem/rordereddict.py
+++ b/rpython/rtyper/lltypesystem/rordereddict.py
@@ -563,6 +563,7 @@
d.num_ever_used_items += 1
d.num_live_items += 1
+@jit.dont_look_inside
def _ll_dict_rescue(d):
# MemoryError situation! The 'indexes' contains an invalid entry
# at this point. But we can call ll_dict_reindex() with the
@@ -588,6 +589,7 @@
def _ll_len_of_d_indexes(d):
# xxx Haaaack: returns len(d.indexes). Works independently of
# the exact type pointed to by d, using a forced cast...
+ # Must only be called by @jit.dont_look_inside functions.
return len(rffi.cast(DICTINDEX_BYTE, d.indexes))
def _overallocate_entries_len(baselen):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
