Author: Armin Rigo <ar...@tunes.org>
Branch: stm
Changeset: r51354:a14e0f148aad
Date: 2012-01-16 17:53 +0100
http://bitbucket.org/pypy/pypy/changeset/a14e0f148aad/
Log: hg merge
diff --git a/pypy/translator/stm/test/test_transform.py
b/pypy/translator/stm/test/test_transform.py
--- a/pypy/translator/stm/test/test_transform.py
+++ b/pypy/translator/stm/test/test_transform.py
@@ -150,7 +150,7 @@
return p.x
interp, graph = get_interpreter(func, [p])
transform_graph(graph)
- assert summary(graph) == {'stm_try_inevitable': 1, 'getfield': 1}
+ assert summary(graph) == {'stm_become_inevitable': 1, 'getfield': 1}
res = eval_stm_graph(interp, graph, [p], stm_mode="regular_transaction",
final_stm_mode="inevitable_transaction")
assert res == 42
@@ -163,7 +163,7 @@
p.x = 43
interp, graph = get_interpreter(func, [p])
transform_graph(graph)
- assert summary(graph) == {'stm_try_inevitable': 1, 'setfield': 1}
+ assert summary(graph) == {'stm_become_inevitable': 1, 'setfield': 1}
eval_stm_graph(interp, graph, [p], stm_mode="regular_transaction",
final_stm_mode="inevitable_transaction")
@@ -175,7 +175,7 @@
return p[3]
interp, graph = get_interpreter(func, [p])
transform_graph(graph)
- assert summary(graph) == {'stm_try_inevitable': 1, 'getarrayitem': 1}
+ assert summary(graph) == {'stm_become_inevitable': 1, 'getarrayitem': 1}
res = eval_stm_graph(interp, graph, [p], stm_mode="regular_transaction",
final_stm_mode="inevitable_transaction")
assert res == 42
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
