From 07f81f89dfefe36593e23645bd0e4a9cd2dc4b56 Mon Sep 17 00:00:00 2001 From: sweeneyde Date: Thu, 12 May 2022 05:03:50 -0400 Subject: [PATCH 1/5] Add some failing tests --- Lib/test/test_sys_settrace.py | 48 +++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py index 4f13bbd6bfda2f..93199cb52ea929 100644 --- a/Lib/test/test_sys_settrace.py +++ b/Lib/test/test_sys_settrace.py @@ -2094,6 +2094,54 @@ def gen(): yield 3 next(gen()) output.append(5) + + @jump_test(2, 3, [1, 3]) + def test_jump_forward_over_listcomp(output): + output.append(1) + x = [i for i in range(10)] + output.append(3) + + # checking for segfaults. + # See https://github.com/python/cpython/issues/92311 + @jump_test(3, 1, []) + def test_jump_backward_over_listcomp(output): + a = 1 + x = [i for i in range(10)] + c = 3 + + @jump_test(8, 2, [2, 6, 2]) + def test_jump_backward_over_listcomp_v2(output): + flag = False # 1 + output.append(2) # 2 + if flag: # 3 + return # 4 + x = [i for i in range(10)] # 5 + flag = True # 6 + output.append(6) # 7 + output.append(7) # 8 + + @async_jump_test(2, 3, [1, 3]) + async def test_jump_forward_over_async_listcomp(output): + output.append(1) + x = [i async for i in asynciter(range(10))] + output.append(3) + + @jump_test(3, 1, []) + async def test_jump_backward_over_async_listcomp(output): + a = 1 + x = [i async for i in asynciter(range(10))] + c = 3 + + @jump_test(8, 2, [2, 6, 2]) + async def test_jump_backward_over_async_listcomp_v2(output): + flag = False + output.append(2) + if flag: + return + x = [i async for i in asynciter(range(10))] + flag = True + output.append(6) + output.append(7) if __name__ == "__main__": From 1762411ea9dec49774b8fd2d7e92552298ca7dad Mon Sep 17 00:00:00 2001 From: sweeneyde Date: Thu, 12 May 2022 05:06:42 -0400 Subject: [PATCH 2/5] comprehensions don't get Loop blocks --- Objects/frameobject.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Objects/frameobject.c b/Objects/frameobject.c index d02cf9d3ba9f06..bcfcf9889ebb21 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -195,7 +195,10 @@ markblocks(PyCodeObject *code_obj, int len) break; case GET_ITER: case GET_AITER: - block_stack = push_block(block_stack, Loop); + // For loops get a Loop block, but comprehensions do not. + if (_Py_OPCODE(code[i + 1]) != CALL_FUNCTION) { + block_stack = push_block(block_stack, Loop); + } blocks[i+1] = block_stack; break; case FOR_ITER: From 245a2d3efcf22b504570134e00000b67f60d009e Mon Sep 17 00:00:00 2001 From: sweeneyde Date: Thu, 12 May 2022 05:29:35 -0400 Subject: [PATCH 3/5] Fix typo in test cases --- Lib/test/test_sys_settrace.py | 4 ++-- Objects/frameobject.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py index 93199cb52ea929..1b2bdc8c674477 100644 --- a/Lib/test/test_sys_settrace.py +++ b/Lib/test/test_sys_settrace.py @@ -2126,13 +2126,13 @@ async def test_jump_forward_over_async_listcomp(output): x = [i async for i in asynciter(range(10))] output.append(3) - @jump_test(3, 1, []) + @async_jump_test(3, 1, []) async def test_jump_backward_over_async_listcomp(output): a = 1 x = [i async for i in asynciter(range(10))] c = 3 - @jump_test(8, 2, [2, 6, 2]) + @async_jump_test(8, 2, [2, 6, 2]) async def test_jump_backward_over_async_listcomp_v2(output): flag = False output.append(2) diff --git a/Objects/frameobject.c b/Objects/frameobject.c index bcfcf9889ebb21..be84d33bf52389 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -195,7 +195,7 @@ markblocks(PyCodeObject *code_obj, int len) break; case GET_ITER: case GET_AITER: - // For loops get a Loop block, but comprehensions do not. + // For-loops get a Loop block, but comprehensions do not. if (_Py_OPCODE(code[i + 1]) != CALL_FUNCTION) { block_stack = push_block(block_stack, Loop); } From 7c0d96a455471bf3ae79385da878dfa15fc06e24 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Thu, 12 May 2022 09:38:22 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2022-05-12-09-38-20.gh-issue-92311.VEgtts.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2022-05-12-09-38-20.gh-issue-92311.VEgtts.rst diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-05-12-09-38-20.gh-issue-92311.VEgtts.rst b/Misc/NEWS.d/next/Core and Builtins/2022-05-12-09-38-20.gh-issue-92311.VEgtts.rst new file mode 100644 index 00000000000000..b800def656cbfd --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2022-05-12-09-38-20.gh-issue-92311.VEgtts.rst @@ -0,0 +1 @@ +Fixed a bug where setting ``frame.f_lineno`` to jump over a list comprehension could misbehave or crash. From 2d73c805b107793f306882dd1b0bc10f1f0951d5 Mon Sep 17 00:00:00 2001 From: sweeneyde Date: Thu, 12 May 2022 06:08:00 -0400 Subject: [PATCH 5/5] Make constants match line numbers --- Lib/test/test_sys_settrace.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Lib/test/test_sys_settrace.py b/Lib/test/test_sys_settrace.py index 1b2bdc8c674477..76d1aeecf69e45 100644 --- a/Lib/test/test_sys_settrace.py +++ b/Lib/test/test_sys_settrace.py @@ -2109,16 +2109,16 @@ def test_jump_backward_over_listcomp(output): x = [i for i in range(10)] c = 3 - @jump_test(8, 2, [2, 6, 2]) + @jump_test(8, 2, [2, 7, 2]) def test_jump_backward_over_listcomp_v2(output): - flag = False # 1 - output.append(2) # 2 - if flag: # 3 - return # 4 - x = [i for i in range(10)] # 5 - flag = True # 6 - output.append(6) # 7 - output.append(7) # 8 + flag = False + output.append(2) + if flag: + return + x = [i for i in range(5)] + flag = 6 + output.append(7) + output.append(8) @async_jump_test(2, 3, [1, 3]) async def test_jump_forward_over_async_listcomp(output): @@ -2132,16 +2132,16 @@ async def test_jump_backward_over_async_listcomp(output): x = [i async for i in asynciter(range(10))] c = 3 - @async_jump_test(8, 2, [2, 6, 2]) + @async_jump_test(8, 2, [2, 7, 2]) async def test_jump_backward_over_async_listcomp_v2(output): flag = False output.append(2) if flag: return - x = [i async for i in asynciter(range(10))] - flag = True - output.append(6) + x = [i async for i in asynciter(range(5))] + flag = 6 output.append(7) + output.append(8) if __name__ == "__main__":