Author: Armin Rigo <ar...@tunes.org>
Branch: vmprof-newstack
Changeset: r81779:334e44a24a23
Date: 2016-01-15 10:02 +0100
http://bitbucket.org/pypy/pypy/changeset/334e44a24a23/
Log: fix some tests
diff --git a/rpython/memory/gctransform/shadowstack.py
b/rpython/memory/gctransform/shadowstack.py
--- a/rpython/memory/gctransform/shadowstack.py
+++ b/rpython/memory/gctransform/shadowstack.py
@@ -315,7 +315,7 @@
while addr != start:
addr -= sizeofaddr
gc._trace_callback(callback, arg, addr)
-
+
gc = gctransformer.gcdata.gc
assert not hasattr(gc, 'custom_trace_dispatcher')
# ^^^ create_custom_trace_funcs() must not run before this
diff --git a/rpython/rlib/rvmprof/rvmprof.py b/rpython/rlib/rvmprof/rvmprof.py
--- a/rpython/rlib/rvmprof/rvmprof.py
+++ b/rpython/rlib/rvmprof/rvmprof.py
@@ -193,7 +193,7 @@
if we_are_translated() and not jit.we_are_jitted():
unique_id = get_code_fn(*args)._vmprof_unique_id
ll_args, token = lower(*args)
- ll_trampoline = get_ll_trampoline(token, True)
+ ll_trampoline = get_ll_trampoline(token)
ll_result = ll_trampoline(*ll_args + (unique_id,))
else:
return func(*args)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
