mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-16 07:45:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

If Py_OptimizeFlag is false then always evaluate assert conditions, don't

Browse source 
test __debug__ at runtime.  Closes SF patch #548833.
This commit is contained in:
Neil Schemenauer 2002-04-26 01:58:53 +00:00
parent 9364698101
commit 89e3ee0ccf
2 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Misc/NEWS
View file

@ -6,6 +6,10 @@ Type/class unification and new-style classes
Core and builtins Core and builtins
- The assert statement no longer tests __debug__ at runtime. This means
that assert statements cannot be disabled by assigning a false value
to __debug__.
- A method zfill() was added to str and unicode, that fills a numeric - A method zfill() was added to str and unicode, that fills a numeric
string to the left with zeros. For example, string to the left with zeros. For example,
"+123".zfill(6) -> "+00123". "+123".zfill(6) -> "+00123".

22
Python/compile.c
View file

@ -2664,27 +2664,20 @@ com_expr_stmt(struct compiling *c, node *n)
static void static void
com_assert_stmt(struct compiling *c, node *n) com_assert_stmt(struct compiling *c, node *n)
{ {
int a = 0, b = 0; int a = 0;
int i; int i;
REQ(n, assert_stmt); /* 'assert' test [',' test] */ REQ(n, assert_stmt); /* 'assert' test [',' test] */
/* Generate code like for if (Py_OptimizeFlag)
return;
/* Generate code like
if __debug__: if not <test>:
if not <test>:
raise AssertionError [, <message>] raise AssertionError [, <message>]
where <message> is the second test, if present. where <message> is the second test, if present.
*/ */
if (Py_OptimizeFlag)
return;
com_addop_name(c, LOAD_GLOBAL, "__debug__");
com_push(c, 1);
com_addfwref(c, JUMP_IF_FALSE, &a);
com_addbyte(c, POP_TOP);
com_pop(c, 1);
com_node(c, CHILD(n, 1)); com_node(c, CHILD(n, 1));
com_addfwref(c, JUMP_IF_TRUE, &b); com_addfwref(c, JUMP_IF_TRUE, &a);
com_addbyte(c, POP_TOP); com_addbyte(c, POP_TOP);
com_pop(c, 1); com_pop(c, 1);
/* Raise that exception! */ /* Raise that exception! */
@ -2696,9 +2689,8 @@ com_assert_stmt(struct compiling *c, node *n)
com_addoparg(c, RAISE_VARARGS, i); com_addoparg(c, RAISE_VARARGS, i);
com_pop(c, i); com_pop(c, i);
/* The interpreter does not fall through */ /* The interpreter does not fall through */
/* All jumps converge here */ /* Jump ends up here */
com_backpatch(c, a); com_backpatch(c, a);
com_backpatch(c, b);
com_addbyte(c, POP_TOP); com_addbyte(c, POP_TOP);
} }