mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
bpo-38640: Allow break and continue in always false while loops (GH-16992)
This commit is contained in:
parent
24c6258269
commit
6c3e66a34b
3 changed files with 29 additions and 0 deletions
|
@ -731,6 +731,24 @@ if 1:
|
||||||
self.assertEqual(None, opcodes[0].argval)
|
self.assertEqual(None, opcodes[0].argval)
|
||||||
self.assertEqual('RETURN_VALUE', opcodes[1].opname)
|
self.assertEqual('RETURN_VALUE', opcodes[1].opname)
|
||||||
|
|
||||||
|
def test_false_while_loop(self):
|
||||||
|
def break_in_while():
|
||||||
|
while False:
|
||||||
|
break
|
||||||
|
|
||||||
|
def continue_in_while():
|
||||||
|
while False:
|
||||||
|
continue
|
||||||
|
|
||||||
|
funcs = [break_in_while, continue_in_while]
|
||||||
|
|
||||||
|
# Check that we did not raise but we also don't generate bytecode
|
||||||
|
for func in funcs:
|
||||||
|
opcodes = list(dis.get_instructions(func))
|
||||||
|
self.assertEqual(2, len(opcodes))
|
||||||
|
self.assertEqual('LOAD_CONST', opcodes[0].opname)
|
||||||
|
self.assertEqual(None, opcodes[0].argval)
|
||||||
|
self.assertEqual('RETURN_VALUE', opcodes[1].opname)
|
||||||
|
|
||||||
class TestExpressionStackSize(unittest.TestCase):
|
class TestExpressionStackSize(unittest.TestCase):
|
||||||
# These tests check that the computed stack size for a code object
|
# These tests check that the computed stack size for a code object
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
Fixed a bug in the compiler that was causing to raise in the presence of
|
||||||
|
break statements and continue statements inside always false while loops.
|
||||||
|
Patch by Pablo Galindo.
|
|
@ -2738,7 +2738,15 @@ compiler_while(struct compiler *c, stmt_ty s)
|
||||||
|
|
||||||
if (constant == 0) {
|
if (constant == 0) {
|
||||||
BEGIN_DO_NOT_EMIT_BYTECODE
|
BEGIN_DO_NOT_EMIT_BYTECODE
|
||||||
|
// Push a dummy block so the VISIT_SEQ knows that we are
|
||||||
|
// inside a while loop so it can correctly evaluate syntax
|
||||||
|
// errors.
|
||||||
|
if (!compiler_push_fblock(c, WHILE_LOOP, NULL, NULL)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
VISIT_SEQ(c, stmt, s->v.While.body);
|
VISIT_SEQ(c, stmt, s->v.While.body);
|
||||||
|
// Remove the dummy block now that is not needed.
|
||||||
|
compiler_pop_fblock(c, WHILE_LOOP, NULL);
|
||||||
END_DO_NOT_EMIT_BYTECODE
|
END_DO_NOT_EMIT_BYTECODE
|
||||||
if (s->v.While.orelse) {
|
if (s->v.While.orelse) {
|
||||||
VISIT_SEQ(c, stmt, s->v.While.orelse);
|
VISIT_SEQ(c, stmt, s->v.While.orelse);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue