summaryrefslogtreecommitdiffstats
path: root/Python/compile.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-04-28 01:44:22 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-04-28 01:44:22 (GMT)
commit1dfd247c1ba947e99a482eeacfb8cbdecdd45b72 (patch)
tree24aede540fb2fac7e3fe6502f295b9e4d50bd10b /Python/compile.c
parent48050cbbe7cc62e76dbd0fdbf391c183f1c2e30a (diff)
downloadcpython-1dfd247c1ba947e99a482eeacfb8cbdecdd45b72.zip
cpython-1dfd247c1ba947e99a482eeacfb8cbdecdd45b72.tar.gz
cpython-1dfd247c1ba947e99a482eeacfb8cbdecdd45b72.tar.bz2
remove the concept of an unoptimized function scope from the compiler, since it can't happen anymore
Diffstat (limited to 'Python/compile.c')
-rw-r--r--Python/compile.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/Python/compile.c b/Python/compile.c
index d5009e1..855ec46 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -2753,8 +2753,7 @@ compiler_nameop(struct compiler *c, identifier name, expr_context_ty ctx)
optype = OP_FAST;
break;
case GLOBAL_IMPLICIT:
- if (c->u->u_ste->ste_type == FunctionBlock &&
- !c->u->u_ste->ste_unoptimized)
+ if (c->u->u_ste->ste_type == FunctionBlock)
optype = OP_GLOBAL;
break;
case GLOBAL_EXPLICIT:
@@ -4185,9 +4184,7 @@ compute_code_flags(struct compiler *c)
int flags = 0;
Py_ssize_t n;
if (ste->ste_type == FunctionBlock) {
- flags |= CO_NEWLOCALS;
- if (!ste->ste_unoptimized)
- flags |= CO_OPTIMIZED;
+ flags |= CO_NEWLOCALS | CO_OPTIMIZED;
if (ste->ste_nested)
flags |= CO_NESTED;
if (ste->ste_generator)