Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Lib/test/test_frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
11 changes: 9 additions & 2 deletions Objects/frameobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading