Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cython
Commits
72fd9616
Commit
72fd9616
authored
Dec 27, 2010
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
always INCREF Python arguments in 'with gil' C functions as we cannot know who owns them
parent
30504bdb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
2 deletions
+20
-2
Cython/Compiler/Nodes.py
Cython/Compiler/Nodes.py
+2
-2
tests/run/owned_arg_refs.pyx
tests/run/owned_arg_refs.pyx
+18
-0
No files found.
Cython/Compiler/Nodes.py
View file @
72fd9616
...
...
@@ -1353,7 +1353,7 @@ class FuncDefNode(StatNode, BlockNode):
# incref it to properly keep track of refcounts.
for
entry
in
lenv
.
arg_entries
:
if
entry
.
type
.
is_pyobject
:
if
entry
.
assignments
and
not
entry
.
in_closure
:
if
(
acquire_gil
or
entry
.
assignments
)
and
not
entry
.
in_closure
:
code
.
put_var_incref
(
entry
)
# ----- Initialise local variables
for
entry
in
lenv
.
var_entries
:
...
...
@@ -1463,7 +1463,7 @@ class FuncDefNode(StatNode, BlockNode):
if
entry
.
type
.
is_pyobject
:
if
entry
.
in_closure
:
code
.
put_var_giveref
(
entry
)
elif
entry
.
assignments
:
elif
acquire_gil
or
entry
.
assignments
:
code
.
put_var_decref
(
entry
)
if
self
.
needs_closure
:
code
.
put_decref
(
Naming
.
cur_scope_cname
,
lenv
.
scope_class
.
type
)
...
...
tests/run/owned_arg_refs.pyx
View file @
72fd9616
...
...
@@ -15,6 +15,24 @@ def test_ext_type_attr():
owner
.
x
=
''
.
join
(
"abc%d"
%
5
)
# non-interned object
return
call_me_with_owner
(
owner
,
owner
.
x
)
cdef
void
call_me_without_gil
(
Owner
owner
,
x
)
with
gil
:
owner
.
x
=
"def"
# overwrite external reference
print
x
# crashes if x is not owned by function or caller
def
test_ext_type_attr_nogil
():
"""
>>> test_ext_type_attr_nogil()
abc5
"""
owner
=
Owner
()
owner
.
x
=
''
.
join
(
"abc%d"
%
5
)
# non-interned object
with
nogil
:
call_me_without_gil
(
owner
,
owner
.
x
)
# the following isn't dangerous as long as index access uses temps
cdef
call_me_with_list
(
list
l
,
x
):
l
[:]
=
[(
1
,
2
),
(
3
,
4
)]
# overwrite external reference
return
x
# crashes if x is not owned by function or caller
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment