Author: Armin Rigo <[email protected]>
Branch: fast-gil
Changeset: r69824:c42760c25a19
Date: 2014-03-09 12:42 +0100
http://bitbucket.org/pypy/pypy/changeset/c42760c25a19/
Log: Fixes for test_zrpy_release_gil
diff --git a/rpython/jit/backend/llsupport/test/zrpy_releasegil_test.py
b/rpython/jit/backend/llsupport/test/zrpy_releasegil_test.py
--- a/rpython/jit/backend/llsupport/test/zrpy_releasegil_test.py
+++ b/rpython/jit/backend/llsupport/test/zrpy_releasegil_test.py
@@ -27,7 +27,7 @@
glob.event += 1
def before(n, x):
- invoke_around_extcall(func, func)
+ invoke_around_extcall(func, None)
return (n, None, None, None, None, None,
None, None, None, None, None, None)
#
diff --git a/rpython/rlib/objectmodel.py b/rpython/rlib/objectmodel.py
--- a/rpython/rlib/objectmodel.py
+++ b/rpython/rlib/objectmodel.py
@@ -591,8 +591,10 @@
# the 'aroundstate' contains regular function and not ll pointers to them,
# but let's call llhelper() anyway to force their annotation
from rpython.rtyper.annlowlevel import llhelper
- llhelper(rffi.AroundFnPtr, before)
- llhelper(rffi.AroundFnPtr, after)
+ if before is not None:
+ llhelper(rffi.AroundFnPtr, before)
+ if after is not None:
+ llhelper(rffi.AroundFnPtr, after)
def is_in_callback():
from rpython.rtyper.lltypesystem import rffi
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
