Commit 1eb2f0ab authored by Dag Sverre Seljebotn's avatar Dag Sverre Seljebotn

Refnanny: Fix for return from module init function

parent 7c52c8a9
...@@ -1588,6 +1588,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -1588,6 +1588,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
code.putln(header3) code.putln(header3)
code.putln("#endif") code.putln("#endif")
code.putln("{") code.putln("{")
code.putln("PyObject* %s;" % Naming.retval_cname)
tempdecl_code = code.insertion_point() tempdecl_code = code.insertion_point()
code.putln('__Pyx_SetupRefcountContext("%s");' % header3) code.putln('__Pyx_SetupRefcountContext("%s");' % header3)
...@@ -1637,17 +1638,23 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -1637,17 +1638,23 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
# this should be replaced by the module's tp_clear in Py3 # this should be replaced by the module's tp_clear in Py3
code.putln("if (__Pyx_RegisterCleanup()) %s;" % code.error_goto(self.pos)) code.putln("if (__Pyx_RegisterCleanup()) %s;" % code.error_goto(self.pos))
code.putln("#if PY_MAJOR_VERSION < 3") code.putln("%s = %s;" % (Naming.retval_cname, env.module_cname))
code.putln("return;") code.put_goto(code.return_label)
code.putln("#else")
code.putln("return %s;" % env.module_cname)
code.putln("#endif")
code.put_label(code.error_label) code.put_label(code.error_label)
code.put_var_xdecrefs(env.temp_entries) code.put_var_xdecrefs(env.temp_entries)
code.putln('__Pyx_AddTraceback("%s");' % env.qualified_name) code.putln('__Pyx_AddTraceback("%s");' % env.qualified_name)
env.use_utility_code(Nodes.traceback_utility_code) env.use_utility_code(Nodes.traceback_utility_code)
code.putln("#if PY_MAJOR_VERSION >= 3") code.putln("%s = NULL;" % Naming.retval_cname)
code.putln("return NULL;") code.put_label(code.return_label)
code.putln('if (__Pyx_FinishRefcountContext() == -1) {')
code.putln(code.set_error_info(self.pos))
code.putln('__Pyx_AddTraceback("%s");' % env.qualified_name)
code.putln('%s = NULL;' % Naming.retval_cname)
code.putln('}')
code.putln("#if PY_MAJOR_VERSION < 3")
code.putln("return;")
code.putln("#else")
code.putln("return %s;" % Naming.retval_cname)
code.putln("#endif") code.putln("#endif")
code.putln('}') code.putln('}')
......
...@@ -1137,6 +1137,7 @@ class FuncDefNode(StatNode, BlockNode): ...@@ -1137,6 +1137,7 @@ class FuncDefNode(StatNode, BlockNode):
code.putln("PyGILState_Release(_save);") code.putln("PyGILState_Release(_save);")
# code.putln("/* TODO: decref scope object */") # code.putln("/* TODO: decref scope object */")
# ----- Return # ----- Return
# This code is duplicated in ModuleNode.generate_module_init_func
default_retval = self.return_type.default_value default_retval = self.return_type.default_value
err_val = self.error_value() err_val = self.error_value()
if err_val is None and default_retval: if err_val is None and default_retval:
......
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