Author: Maciej Fijalkowski <[email protected]>
Branch: rdict-experiments-3
Changeset: r67569:cb19a98c78ca
Date: 2013-10-24 14:17 +0200
http://bitbucket.org/pypy/pypy/changeset/cb19a98c78ca/

Log:    merge

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
@@ -1099,11 +1099,11 @@
 
     entries = dic.entries
 
-    i = dic.num_used_items - 1
     while True:
+        i = dic.num_used_items - 1
         if entries.valid(i):
             break
-        i -= 1
+        dic.num_used_items -= 1
 
     key = entries[i].key
     index = dic.lookup_function(dic, key, entries.hash(i),
@@ -1122,7 +1122,7 @@
     r = lltype.malloc(ELEM.TO)
     r.item0 = recast(ELEM.TO.item0, entry.key)
     r.item1 = recast(ELEM.TO.item1, entry.value)
-    _ll_dict_del(dic, r_uint(i))
+    _ll_dict_del(dic, i)
     return r
 
 def ll_dict_pop(dic, key):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to