From 8c941d9d301abf254e25380355dff7ba7a9ae18a Mon Sep 17 00:00:00 2001 From: Stefan Behnel Date: Fri, 4 Jan 2013 07:36:45 +0100 Subject: [PATCH] make cleanup safety fix more explicit --- Cython/Compiler/ModuleNode.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Cython/Compiler/ModuleNode.py b/Cython/Compiler/ModuleNode.py index 99b4b4f..2a47277 100644 --- a/Cython/Compiler/ModuleNode.py +++ b/Cython/Compiler/ModuleNode.py @@ -2010,24 +2010,25 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): for entry in rev_entries: if entry.visibility != 'extern': if entry.type.is_pyobject and entry.used: - code.put_decref_clear(entry.cname, - entry.type, - clear_before_decref=True, - nanny=False) + code.put_xdecref_clear( + entry.cname, entry.type, + clear_before_decref=True, + nanny=False) code.putln("__Pyx_CleanupGlobals();") if Options.generate_cleanup_code >= 3: code.putln("/*--- Type import cleanup code ---*/") - for type, _ in env.types_imported.items(): - code.put_decref_clear(type.typeptr_cname, type, - clear_before_decref=True, - nanny=False) + for type in env.types_imported: + code.put_xdecref_clear( + type.typeptr_cname, type, + clear_before_decref=True, + nanny=False) if Options.cache_builtins: code.putln("/*--- Builtin cleanup code ---*/") for entry in env.cached_builtins: - code.put_decref_clear(entry.cname, - PyrexTypes.py_object_type, - clear_before_decref=True, - nanny=False) + code.put_xdecref_clear( + entry.cname, PyrexTypes.py_object_type, + clear_before_decref=True, + nanny=False) code.putln("/*--- Intern cleanup code ---*/") code.put_decref_clear(Naming.empty_tuple, PyrexTypes.py_object_type, -- 2.7.4