From c8f32aae0aa173e122cf4c0592caec620d0d1de9 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Sun, 3 Dec 2017 23:32:54 +1000 Subject: [3.6] bpo-32176: Set CO_NOFREE in the code object constructor (GH-4684) Previously, CO_NOFREE was set in the compiler, which meant it could end up being set incorrectly when code objects were created directly. Setting it in the constructor based on freevars and cellvars ensures it is always accurate, regardless of how the code object is defined. (cherry picked from commit 078f1814f1a4413a2a0fdb8cf4490ee0fc98ef34) --- Python/compile.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'Python/compile.c') diff --git a/Python/compile.c b/Python/compile.c index 797a1840e6..4d525a02c8 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -5190,18 +5190,6 @@ compute_code_flags(struct compiler *c) /* (Only) inherit compilerflags in PyCF_MASK */ flags |= (c->c_flags->cf_flags & PyCF_MASK); - n = PyDict_Size(c->u->u_freevars); - if (n < 0) - return -1; - if (n == 0) { - n = PyDict_Size(c->u->u_cellvars); - if (n < 0) - return -1; - if (n == 0) { - flags |= CO_NOFREE; - } - } - return flags; } -- cgit v1.2.1