Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r72175:45430a184cd3
Date: 2014-06-23 18:52 +0000
http://bitbucket.org/pypy/pypy/changeset/45430a184cd3/
Log: Fixes that should have been done in the ec-threadlocal branch
diff --git a/pypy/module/pypyjit/test_pypy_c/test_call.py
b/pypy/module/pypyjit/test_pypy_c/test_call.py
--- a/pypy/module/pypyjit/test_pypy_c/test_call.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_call.py
@@ -71,13 +71,13 @@
"getfield_gc", "guard_value",
"guard_not_invalidated"]
ops = entry_bridge.ops_by_id('add', opcode='LOAD_GLOBAL')
- assert log.opnames(ops) == ["guard_not_invalidated"]
+ assert log.opnames(ops) == []
#
ops = entry_bridge.ops_by_id('call', opcode='LOAD_GLOBAL')
assert log.opnames(ops) == []
#
assert entry_bridge.match_by_id('call', """
- p38 = call(ConstClass(getexecutioncontext), descr=<Callr . EF=1>)
+ p38 = call(ConstClass(_ll_0_threadlocalref_getter___),
descr=<Callr . EF=1 OS=5>)
p39 = getfield_gc(p38, descr=<FieldP
pypy.interpreter.executioncontext.ExecutionContext.inst_topframeref .*>)
i40 = force_token()
p41 = getfield_gc(p38, descr=<FieldP
pypy.interpreter.executioncontext.ExecutionContext.inst_w_tracefunc .*>)
@@ -435,7 +435,7 @@
p26 = getfield_gc(p7, descr=<FieldP
pypy.objspace.std.dictmultiobject.W_DictMultiObject.inst_strategy .*>)
guard_value(p26, ConstPtr(ptr27), descr=...)
guard_not_invalidated(descr=...)
- p29 = call(ConstClass(getexecutioncontext), descr=<Callr . EF=1>)
+ p29 = call(ConstClass(_ll_0_threadlocalref_getter___),
descr=<Callr . EF=1 OS=5>)
p30 = getfield_gc(p29, descr=<FieldP
pypy.interpreter.executioncontext.ExecutionContext.inst_topframeref .*>)
p31 = force_token()
p32 = getfield_gc(p29, descr=<FieldP
pypy.interpreter.executioncontext.ExecutionContext.inst_w_tracefunc .*>)
@@ -448,7 +448,6 @@
i39 = getfield_gc_pure(p37, descr=<FieldS
pypy.objspace.std.intobject.W_IntObject.inst_intval .*>)
i40 = int_add_ovf(i22, i39)
guard_no_overflow(descr=...)
- guard_not_invalidated(descr=...)
--TICK--
""")
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
