Author: Armin Rigo <[email protected]> Branch: all_ordered_dicts Changeset: r74997:7ef08cb6ae5a Date: 2014-12-17 18:38 +0000 http://bitbucket.org/pypy/pypy/changeset/7ef08cb6ae5a/
Log: merge heads 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 @@ -41,6 +41,7 @@ # # [email protected]_inside_iff(lambda d, key, hash, flag: jit.isvirtual(d)) def ll_call_lookup_function(d, key, hash, flag): fun = d.lookup_function_no if fun == FUNC_BYTE: @@ -449,6 +450,7 @@ else: rgc.ll_arrayclear(lltype.cast_opaque_ptr(DICTINDEX_LONG, d.indexes)) [email protected]_look_inside def ll_call_insert_clean_function(d, hash, i): if d.lookup_function_no == FUNC_BYTE: ll_dict_store_clean(d, hash, i, TYPE_BYTE) @@ -582,6 +584,7 @@ _ll_dict_rescue._dont_inline_ = True def _ll_dict_insertclean(d, key, value, hash): + # never translated ENTRY = lltype.typeOf(d.entries).TO.OF ll_call_insert_clean_function(d, hash, d.num_ever_used_items) entry = d.entries[d.num_ever_used_items] _______________________________________________ pypy-commit mailing list [email protected] https://mail.python.org/mailman/listinfo/pypy-commit
