diff options
author | Stefan Behnel <stefan_ml@behnel.de> | 2019-12-24 11:05:31 +0100 |
---|---|---|
committer | Stefan Behnel <stefan_ml@behnel.de> | 2019-12-26 17:59:47 +0100 |
commit | 19b7aee414bbe9cc79ced7cbf6460bf7823a7056 (patch) | |
tree | 15fad875eb45384d9a3f5ee56f466d411e917ffe | |
parent | bfcaf163e3dcf472ef2af5dec6ac3fffd0d34e66 (diff) | |
download | cython-fix_gh3246.tar.gz |
Fix temp variable handling for the super() class cell.fix_gh3246
Closes GH-3246.
-rw-r--r-- | Cython/Compiler/ExprNodes.py | 25 | ||||
-rw-r--r-- | Cython/Compiler/Nodes.py | 18 | ||||
-rw-r--r-- | tests/run/py3k_super.pyx | 20 |
3 files changed, 45 insertions, 18 deletions
diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py index 424a93965..2bfc638a6 100644 --- a/Cython/Compiler/ExprNodes.py +++ b/Cython/Compiler/ExprNodes.py @@ -9136,21 +9136,20 @@ class ClassCellInjectorNode(ExprNode): def analyse_expressions(self, env): return self - def generate_evaluation_code(self, code): - if self.is_active: - self.allocate_temp_result(code) - code.putln( - '%s = PyList_New(0); %s' % ( - self.result(), - code.error_goto_if_null(self.result(), self.pos))) - code.put_gotref(self.result()) + def generate_result_code(self, code): + assert self.is_active + code.putln( + '%s = PyList_New(0); %s' % ( + self.result(), + code.error_goto_if_null(self.result(), self.pos))) + code.put_gotref(self.result()) def generate_injection_code(self, code, classobj_cname): - if self.is_active: - code.globalstate.use_utility_code( - UtilityCode.load_cached("CyFunctionClassCell", "CythonFunction.c")) - code.put_error_if_neg(self.pos, '__Pyx_CyFunction_InitClassCell(%s, %s)' % ( - self.result(), classobj_cname)) + assert self.is_active + code.globalstate.use_utility_code( + UtilityCode.load_cached("CyFunctionClassCell", "CythonFunction.c")) + code.put_error_if_neg(self.pos, '__Pyx_CyFunction_InitClassCell(%s, %s)' % ( + self.result(), classobj_cname)) class ClassCellNode(ExprNode): diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py index 4bae6a331..db28f2e08 100644 --- a/Cython/Compiler/Nodes.py +++ b/Cython/Compiler/Nodes.py @@ -4596,12 +4596,22 @@ class PyClassDefNode(ClassDefNode): self.metaclass.generate_evaluation_code(code) self.dict.generate_evaluation_code(code) cenv.namespace_cname = cenv.class_obj_cname = self.dict.result() - self.class_cell.generate_evaluation_code(code) + + class_cell = self.class_cell + if class_cell is not None and not class_cell.is_active: + class_cell = None + + if class_cell is not None: + class_cell.generate_evaluation_code(code) self.body.generate_execution_code(code) self.class_result.generate_evaluation_code(code) - self.class_cell.generate_injection_code( - code, self.class_result.result()) - self.class_cell.generate_disposal_code(code) + if class_cell is not None: + class_cell.generate_injection_code( + code, self.class_result.result()) + if class_cell is not None: + class_cell.generate_disposal_code(code) + class_cell.free_temps(code) + cenv.namespace_cname = cenv.class_obj_cname = self.classobj.result() self.target.generate_assignment_code(self.class_result, code) self.dict.generate_disposal_code(code) diff --git a/tests/run/py3k_super.pyx b/tests/run/py3k_super.pyx index 97ff3de14..2968b99b2 100644 --- a/tests/run/py3k_super.pyx +++ b/tests/run/py3k_super.pyx @@ -1,5 +1,5 @@ # mode: run -# tag: py3k_super +# tag: py3k_super, gh3246 class A(object): def method(self): @@ -89,3 +89,21 @@ cdef class CClassSub(CClassBase): # return super().method_cp() # cdef method_c(self): # return super().method_c() + + +def freeing_class_cell_temp_gh3246(): + # https://github.com/cython/cython/issues/3246 + """ + >>> abc = freeing_class_cell_temp_gh3246() + >>> abc().a + 1 + """ + class SimpleBase(object): + def __init__(self): + self.a = 1 + + class ABC(SimpleBase): + def __init__(self): + super().__init__() + + return ABC |