From 4fe72d42df319a7796f25fcddfd79a3dcbcd01e4 Mon Sep 17 00:00:00 2001 From: Tian Gao Date: Wed, 19 Feb 2025 12:11:17 -0500 Subject: [PATCH] [3.13] gh-128396: Fix a crash when inline comprehension has the same local variable as the outside scope (GH-130235) (cherry picked from commit ccf17323c218a2fdcf7f4845d3eaa74ebddefa44) Co-authored-by: Tian Gao --- Lib/test/test_frame.py | 6 ++++++ .../2025-02-17-18-59-33.gh-issue-128396.iVtoYY.rst | 1 + Objects/frameobject.c | 11 +++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2025-02-17-18-59-33.gh-issue-128396.iVtoYY.rst diff --git a/Lib/test/test_frame.py b/Lib/test/test_frame.py index 26100fe6e8421a..2f802179cb3f58 100644 --- a/Lib/test/test_frame.py +++ b/Lib/test/test_frame.py @@ -298,6 +298,12 @@ def f(): self.assertEqual(x, 2) self.assertEqual(y, 3) + def test_closure_with_inline_comprehension(self): + lambda: k + k = 1 + lst = [locals() for k in [0]] + self.assertEqual(lst[0]['k'], 0) + def test_as_dict(self): x = 1 y = 2 diff --git a/Misc/NEWS.d/next/Core and Builtins/2025-02-17-18-59-33.gh-issue-128396.iVtoYY.rst b/Misc/NEWS.d/next/Core and Builtins/2025-02-17-18-59-33.gh-issue-128396.iVtoYY.rst new file mode 100644 index 00000000000000..4382b77f35a86c --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2025-02-17-18-59-33.gh-issue-128396.iVtoYY.rst @@ -0,0 +1 @@ +Fix a crash that occurs when calling :func:`locals` inside an inline comprehension that uses the same local variable as the outer frame scope where the variable is a free or cell var. diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 8c596ede70ca3d..d947f655d573ba 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -35,8 +35,15 @@ framelocalsproxy_getval(_PyInterpreterFrame *frame, PyCodeObject *co, int i) if (kind == CO_FAST_FREE || kind & CO_FAST_CELL) { // The cell was set when the frame was created from // the function's closure. - assert(PyCell_Check(value)); - cell = value; + // GH-128396: With PEP 709, it's possible to have a fast variable in + // an inlined comprehension that has the same name as the cell variable + // in the frame, where the `kind` obtained from frame can not guarantee + // that the variable is a cell. + // If the variable is not a cell, we are okay with it and we can simply + // return the value. + if (PyCell_Check(value)) { + cell = value; + } } if (cell != NULL) {