[3.12] GH-94438: Restore ability to jump over None tests (GH-111243)

(cherry picked from commit 6640f1d8d2)
Co-authored-by: Savannah Ostrowski <sostrowski@microsoft.com>
This commit is contained in:
Miss Islington (bot) 2023-10-24 08:39:26 +02:00 committed by GitHub
parent b622c2dcbe
commit 0bbdfe611a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 0 deletions

View file

@ -2033,6 +2033,40 @@ class JumpTestCase(unittest.TestCase):
output.append(1)
output.append(2)
@jump_test(1, 4, [5])
def test_jump_is_none_forwards(output):
x = None
if x is None:
output.append(3)
else:
output.append(5)
@jump_test(6, 5, [3, 5, 6])
def test_jump_is_none_backwards(output):
x = None
if x is None:
output.append(3)
else:
output.append(5)
output.append(6)
@jump_test(1, 4, [5])
def test_jump_is_not_none_forwards(output):
x = None
if x is not None:
output.append(3)
else:
output.append(5)
@jump_test(6, 5, [5, 5, 6])
def test_jump_is_not_none_backwards(output):
x = None
if x is not None:
output.append(3)
else:
output.append(5)
output.append(6)
@jump_test(3, 5, [2, 5], warning=(RuntimeWarning, unbound_locals))
def test_jump_out_of_block_forwards(output):
for i in 1, 2:

View file

@ -1342,6 +1342,7 @@ Michele Orrù
Tomáš Orsava
Oleg Oshmyan
Denis Osipov
Savannah Ostrowski
Denis S. Otkidach
Peter Otten
Michael Otteneder

View file

@ -0,0 +1 @@
Fix a regression that prevented jumping across ``is None`` and ``is not None`` when debugging. Patch by Savannah Ostrowski.

View file

@ -328,6 +328,8 @@ mark_stacks(PyCodeObject *code_obj, int len)
switch (opcode) {
case POP_JUMP_IF_FALSE:
case POP_JUMP_IF_TRUE:
case POP_JUMP_IF_NONE:
case POP_JUMP_IF_NOT_NONE:
{
int64_t target_stack;
int j = next_i + oparg;