GH-94438: Restore ability to jump over None tests (GH-111237)
diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py
index f021696..6be9d3f 100644
--- a/Lib/test/test_sys_settrace.py
+++ b/Lib/test/test_sys_settrace.py
@@ -2064,6 +2064,40 @@ def test_jump_simple_backwards(output):
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:
diff --git a/Misc/ACKS b/Misc/ACKS
index 94cb196..812aa1b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1345,6 +1345,7 @@
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 d754443..12faef0 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -329,6 +329,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;
