diff options
| author | Savannah Ostrowski <sostrowski@microsoft.com> | 2023-10-25 20:47:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-25 20:47:16 (GMT) |
| commit | 12c7e5071cb6013df69586ccc26835742c4d86b9 (patch) | |
| tree | 0b492e0e86e8b5a2274da1de7cdcd683485c145b | |
| parent | 6fea61a9e02260648fbec204e9caac6d5176cc7b (diff) | |
| download | cpython-12c7e5071cb6013df69586ccc26835742c4d86b9.zip cpython-12c7e5071cb6013df69586ccc26835742c4d86b9.tar.gz cpython-12c7e5071cb6013df69586ccc26835742c4d86b9.tar.bz2 | |
[3.11] GH-94438: Restore ability to jump over None tests (GH-111338)
(cherry picked from commit 6640f1d)
| -rw-r--r-- | Lib/test/test_sys_settrace.py | 34 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2023-10-23-22-11-09.gh-issue-94438.y2pITu.rst | 1 | ||||
| -rw-r--r-- | Objects/frameobject.c | 12 |
4 files changed, 46 insertions, 2 deletions
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py index 3540192..e97e122 100644 --- a/Lib/test/test_sys_settrace.py +++ b/Lib/test/test_sys_settrace.py @@ -1952,6 +1952,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]) def test_jump_out_of_block_forwards(output): for i in 1, 2: @@ -1324,6 +1324,7 @@ Michele Orrù Tomáš Orsava Oleg Oshmyan Denis Osipov +Savannah Ostrowski Denis S. Otkidach Peter Otten Michael Otteneder diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-23-22-11-09.gh-issue-94438.y2pITu.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-23-22-11-09.gh-issue-94438.y2pITu.rst new file mode 100644 index 0000000..b6e147a --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2023-10-23-22-11-09.gh-issue-94438.y2pITu.rst @@ -0,0 +1 @@ +Fix a regression that prevented jumping across ``is None`` and ``is not None`` when debugging. Patch by Savannah Ostrowski. diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 425749d..c95e871 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -315,19 +315,27 @@ mark_stacks(PyCodeObject *code_obj, int len) case POP_JUMP_BACKWARD_IF_FALSE: case POP_JUMP_FORWARD_IF_TRUE: case POP_JUMP_BACKWARD_IF_TRUE: + case POP_JUMP_FORWARD_IF_NONE: + case POP_JUMP_BACKWARD_IF_NONE: + case POP_JUMP_FORWARD_IF_NOT_NONE: + case POP_JUMP_BACKWARD_IF_NOT_NONE: { int64_t target_stack; int j = get_arg(code, i); if (opcode == POP_JUMP_FORWARD_IF_FALSE || opcode == POP_JUMP_FORWARD_IF_TRUE || opcode == JUMP_IF_FALSE_OR_POP || - opcode == JUMP_IF_TRUE_OR_POP) + opcode == JUMP_IF_TRUE_OR_POP || + opcode == POP_JUMP_FORWARD_IF_NONE || + opcode == POP_JUMP_FORWARD_IF_NOT_NONE) { j += i + 1; } else { assert(opcode == POP_JUMP_BACKWARD_IF_FALSE || - opcode == POP_JUMP_BACKWARD_IF_TRUE); + opcode == POP_JUMP_BACKWARD_IF_TRUE || + opcode == POP_JUMP_BACKWARD_IF_NONE || + opcode == POP_JUMP_BACKWARD_IF_NOT_NONE); j = i + 1 - j; } assert(j < len); |