Author: Armin Rigo <ar...@tunes.org>
Branch: errno-again
Changeset: r75435:9cdf809ec5a5
Date: 2015-01-19 12:08 +0100
http://bitbucket.org/pypy/pypy/changeset/9cdf809ec5a5/
Log: hg merge default
diff --git a/pypy/module/pypyjit/test_pypy_c/test_containers.py
b/pypy/module/pypyjit/test_pypy_c/test_containers.py
--- a/pypy/module/pypyjit/test_pypy_c/test_containers.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_containers.py
@@ -68,7 +68,7 @@
guard_no_exception(descr=...)
i12 = call(ConstClass(ll_strhash), p10, descr=<Calli . r EF=0>)
p13 = new(descr=...)
- p15 = new_array_clear(8, descr=<ArrayU 1>)
+ p15 = new_array_clear(16, descr=<ArrayU 1>)
{{{
setfield_gc(p13, 0, descr=<FieldS dicttable.num_ever_used_items
.+>)
setfield_gc(p13, p15, descr=<FieldP dicttable.indexes .+>)
diff --git a/rpython/translator/tool/test/test_staticsizereport.py
b/rpython/translator/tool/test/test_staticsizereport.py
--- a/rpython/translator/tool/test/test_staticsizereport.py
+++ b/rpython/translator/tool/test/test_staticsizereport.py
@@ -59,7 +59,7 @@
assert guess_size(func.builder.db, dictvalnode, set()) > 100
assert guess_size(func.builder.db, dictvalnode2, set()) == (
(4 * S + 2 * P) + # struct dicttable
- (S + 8) + # indexes, length 8
+ (S + 16) + # indexes, length 16
(S + S + S)) # entries, length 1
r_set = set()
dictnode_size = guess_size(db, test_dictnode, r_set)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
