From 15025704381fc12ec794563435f3680534b1ea59 Mon Sep 17 00:00:00 2001 From: Manjusaka Date: Wed, 19 Jun 2024 01:55:31 +0800 Subject: [PATCH 1/2] gh-120437: Fix `_CHECK_STACK_SPACE` optimization problems after introduced in gh-118322 Co-Authored-By: Ken Jin Signed-off-by: Manjusaka --- .../2024-06-19-01-58-54.gh-issue-120437.nCkIoI.rst | 1 + Python/optimizer_bytecodes.c | 1 - Python/optimizer_cases.c.h | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2024-06-19-01-58-54.gh-issue-120437.nCkIoI.rst diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-06-19-01-58-54.gh-issue-120437.nCkIoI.rst b/Misc/NEWS.d/next/Core and Builtins/2024-06-19-01-58-54.gh-issue-120437.nCkIoI.rst new file mode 100644 index 00000000000000..9e3c58198325a7 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2024-06-19-01-58-54.gh-issue-120437.nCkIoI.rst @@ -0,0 +1 @@ +Fix ``_CHECK_STACK_SPACE`` optimization problems after introduced in :gh:`118322`. diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c index 35463f25246803..2ea839f5d6dc97 100644 --- a/Python/optimizer_bytecodes.c +++ b/Python/optimizer_bytecodes.c @@ -601,7 +601,6 @@ dummy_func(void) { (void)callable; (void)self_or_null; (void)args; - first_valid_check_stack = NULL; new_frame = NULL; ctx->done = true; } diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 46501862ff2fb3..7274bd2a6fc02b 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -1492,7 +1492,6 @@ (void)callable; (void)self_or_null; (void)args; - first_valid_check_stack = NULL; new_frame = NULL; ctx->done = true; stack_pointer[-2 - oparg] = (_Py_UopsSymbol *)new_frame; From 05f2d2c715a92b17e60d162ccc089e841eb617e4 Mon Sep 17 00:00:00 2001 From: Ken Jin Date: Wed, 19 Jun 2024 21:54:37 +0800 Subject: [PATCH 2/2] Update Misc/NEWS.d/next/Core and Builtins/2024-06-19-01-58-54.gh-issue-120437.nCkIoI.rst --- .../2024-06-19-01-58-54.gh-issue-120437.nCkIoI.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-06-19-01-58-54.gh-issue-120437.nCkIoI.rst b/Misc/NEWS.d/next/Core and Builtins/2024-06-19-01-58-54.gh-issue-120437.nCkIoI.rst index 9e3c58198325a7..8923f3fcefe3c1 100644 --- a/Misc/NEWS.d/next/Core and Builtins/2024-06-19-01-58-54.gh-issue-120437.nCkIoI.rst +++ b/Misc/NEWS.d/next/Core and Builtins/2024-06-19-01-58-54.gh-issue-120437.nCkIoI.rst @@ -1 +1 @@ -Fix ``_CHECK_STACK_SPACE`` optimization problems after introduced in :gh:`118322`. +Fix ``_CHECK_STACK_SPACE`` optimization problems introduced in :gh:`118322`.