Commit e170c96d authored by Stefan Behnel's avatar Stefan Behnel

partial rewrite of the #654 fix to exclude local variables from being put into temps, more tests

--HG--
rename : tests/run/function_argument_sideeffects_T654.pyx => tests/run/temp_sideeffects_T654.pyx
parent 297f652d
...@@ -2913,6 +2913,13 @@ class SimpleCallNode(CallNode): ...@@ -2913,6 +2913,13 @@ class SimpleCallNode(CallNode):
func_type = func_type.base_type func_type = func_type.base_type
return func_type return func_type
def is_simple(self):
# C function calls could be considered simple, but they may
# have side-effects that may hit when multiple operations must
# be effected in order, e.g. when constructing the argument
# sequence for a function call or comparing values.
return False
def analyse_c_function_call(self, env): def analyse_c_function_call(self, env):
if self.function.type is error_type: if self.function.type is error_type:
self.type = error_type self.type = error_type
...@@ -2954,16 +2961,17 @@ class SimpleCallNode(CallNode): ...@@ -2954,16 +2961,17 @@ class SimpleCallNode(CallNode):
some_args_in_temps = False some_args_in_temps = False
for i in range(min(max_nargs, actual_nargs)): for i in range(min(max_nargs, actual_nargs)):
formal_type = func_type.args[i].type formal_type = func_type.args[i].type
arg = self.args[i].coerce_to(formal_type, env) arg = self.args[i].coerce_to(formal_type, env).coerce_to_simple(env)
if arg.type.is_pyobject and not env.nogil and (arg.is_attribute or not arg.is_simple): if arg.is_temp:
# we do not own the argument's reference, but we must
# make sure it cannot be collected before we return
# from the function, so we create an owned temp
# reference to it
some_args_in_temps = True some_args_in_temps = True
arg = arg.coerce_to_temp(env) elif arg.type.is_pyobject and not env.nogil:
elif arg.is_temp: if not arg.is_name or arg.entry and (not arg.entry.is_local or arg.entry.in_closure):
# we do not safely own the argument's reference,
# but we must make sure it cannot be collected
# before we return from the function, so we create
# an owned temp reference to it
some_args_in_temps = True some_args_in_temps = True
arg = arg.coerce_to_temp(env)
self.args[i] = arg self.args[i] = arg
if some_args_in_temps: if some_args_in_temps:
# if some args are temps and others are not, they may get # if some args are temps and others are not, they may get
...@@ -2971,6 +2979,8 @@ class SimpleCallNode(CallNode): ...@@ -2971,6 +2979,8 @@ class SimpleCallNode(CallNode):
# sure they are either all temps or all not temps # sure they are either all temps or all not temps
for i in range(min(max_nargs, actual_nargs)): for i in range(min(max_nargs, actual_nargs)):
arg = self.args[i] arg = self.args[i]
# local variables are safe
if not arg.is_name or arg.entry and (not arg.entry.is_local or arg.entry.in_closure):
# can't copy a Python reference into a temp in nogil # can't copy a Python reference into a temp in nogil
# env (this is safe: a construction would fail in # env (this is safe: a construction would fail in
# nogil anyway) # nogil anyway)
......
order = []
cdef int f():
order.append(1)
return 1
def g():
order.append(2)
return 2
cdef call(int x, object o):
return x, o
def test():
"""
>>> order
[]
>>> test()
(1, 2)
>>> order
[1, 2]
"""
return call(f(), g())
# function call arguments
arg_order = []
cdef int f():
arg_order.append(1)
return 1
def g():
arg_order.append(2)
return 2
cdef call2(int x, object o):
return x, o
def test_c_call():
"""
>>> arg_order
[]
>>> test_c_call()
(1, 2)
>>> arg_order
[1, 2]
"""
return call2(f(), g())
# module globals
cdef object X = 1
cdef redefine_global():
global X
x,X = X,2
return x
cdef call3(object x1, int o, object x2):
return (x1, o, x2)
def test_global_redefine():
"""
>>> test_global_redefine()
(1, 1, 2)
"""
return call3(X, redefine_global(), X)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment