mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-01 04:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

[3.6] bpo-27169: The __debug__ constant is now optimized out at compile time. (GH-4880) (#4882)

Browse source 
This fixes also bpo-22091..
(cherry picked from commit 3325a6780c)
This commit is contained in:
Serhiy Storchaka 2017-12-15 13:26:26 +02:00 • committed by GitHub
parent 22097aaa77
commit b82da9ebb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/test/test_builtin.py
View file

@ -331,16 +331,16 @@ class BuiltinTest(unittest.TestCase):
try:
assert False
except AssertionError:
return (True, f.__doc__)
return (True, f.__doc__, __debug__)
else:
return (False, f.__doc__)
return (False, f.__doc__, __debug__)
'''
def f(): """doc"""
values = [(-1, __debug__, f.__doc__),
(0, True, 'doc'),
(1, False, 'doc'),
(2, False, None)]
for optval, debugval, docstring in values:
values = [(-1, __debug__, f.__doc__, __debug__),
(0, True, 'doc', True),
(1, False, 'doc', False),
(2, False, None, False)]
for optval, *expected in values:
# test both direct compilation and compilation via AST
codeobjs = []
codeobjs.append(compile(codestr, "<test>", "exec", optimize=optval))
@ -350,7 +350,7 @@ class BuiltinTest(unittest.TestCase):
ns = {}
exec(code, ns)
rv = ns['f']()
self.assertEqual(rv, (debugval, docstring))
self.assertEqual(rv, tuple(expected))
def test_delattr(self):
sys.spam = 1

1
Lib/test/test_compile.py
View file

@ -35,6 +35,7 @@ class TestSpecifics(unittest.TestCase):
import builtins
prev = builtins.__debug__
setattr(builtins, '__debug__', 'sure')
self.assertEqual(__debug__, prev)
setattr(builtins, '__debug__', prev)
def test_argument_handling(self):

2
Misc/NEWS.d/next/Core and Builtins/2017-12-15-11-50-06.bpo-27169.VO84fQ.rst Normal file
View file

@ -0,0 +1,2 @@
The ``__debug__`` constant is now optimized out at compile time. This fixes also
bpo-22091.

43
Python/compile.c
View file

@ -1343,13 +1343,15 @@ is_const(expr_ty e)
case Ellipsis_kind:
case NameConstant_kind:
return 1;
case Name_kind:
return _PyUnicode_EqualToASCIIString(e->v.Name.id, "__debug__");
default:
return 0;
}
}
static PyObject *
get_const_value(expr_ty e)
get_const_value(struct compiler *c, expr_ty e)
{
switch (e->kind) {
case Constant_kind:
@ -1364,6 +1366,9 @@ get_const_value(expr_ty e)
return Py_Ellipsis;
case NameConstant_kind:
return e->v.NameConstant.value;
case Name_kind:
assert(_PyUnicode_EqualToASCIIString(e->v.Name.id, "__debug__"));
return c->c_optimize ? Py_False : Py_True;
default:
assert(!is_const(e));
return NULL;
@ -3035,6 +3040,11 @@ compiler_nameop(struct compiler *c, identifier name, expr_context_ty ctx)
!_PyUnicode_EqualToASCIIString(name, "True") &&
!_PyUnicode_EqualToASCIIString(name, "False"));
if (ctx == Load && _PyUnicode_EqualToASCIIString(name, "__debug__")) {
ADDOP_O(c, LOAD_CONST, c->c_optimize ? Py_False : Py_True, consts);
return 1;
}
op = 0;
optype = OP_NAME;
scope = PyST_GetScope(c->u->u_ste, mangled);
@ -3298,7 +3308,7 @@ compiler_subdict(struct compiler *c, expr_ty e, Py_ssize_t begin, Py_ssize_t end
return 0;
}
for (i = begin; i < end; i++) {
key = get_const_value((expr_ty)asdl_seq_GET(e->v.Dict.keys, i));
key = get_const_value(c, (expr_ty)asdl_seq_GET(e->v.Dict.keys, i));
Py_INCREF(key);
PyTuple_SET_ITEM(keys, i - begin, key);
}
@ -4044,36 +4054,11 @@ compiler_visit_keyword(struct compiler *c, keyword_ty k)
static int
expr_constant(struct compiler *c, expr_ty e)
{
char *id;
switch (e->kind) {
case Ellipsis_kind:
return 1;
case Constant_kind:
return PyObject_IsTrue(e->v.Constant.value);
case Num_kind:
return PyObject_IsTrue(e->v.Num.n);
case Str_kind:
return PyObject_IsTrue(e->v.Str.s);
case Name_kind:
/* optimize away names that can't be reassigned */
id = PyUnicode_AsUTF8(e->v.Name.id);
if (id && strcmp(id, "__debug__") == 0)
return !c->c_optimize;
return -1;
case NameConstant_kind: {
PyObject *o = e->v.NameConstant.value;
if (o == Py_None)
return 0;
else if (o == Py_True)
return 1;
else if (o == Py_False)
return 0;
if (is_const(e)) {
return PyObject_IsTrue(get_const_value(c, e));
}
/* fall through */
default:
return -1;
}
}
/*