Skip to content

[DONT MERGE YET][dynamo][guards] Do not dict pop in framelocals dict creation #164038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[DONT MERGE YET][dynamo][guards] Do not dict pop in framelocals dict creation #164038

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5bc6e5
[dynamo][guards] Do not dict pop in framelocals dict creation
anijain2305 Sep 27, 2025
6ec6a03
Update on "[dynamo][guards] Do not dict pop in framelocals dict creat…
anijain2305 Sep 30, 2025
044eaff
Update on "[dynamo][guards] Do not dict pop in framelocals dict creat…
anijain2305 Sep 30, 2025
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
8 changes: 7 additions & 1 deletion torch/csrc/dynamo/framelocals_mapping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,16 +145,22 @@ FrameLocalsMapping::FrameLocalsMapping(FrameLocalsFrameType* frame)

void FrameLocalsMapping::_realize_dict() {
_dict = py::dict();
std::unordered_set<PyObject*> seen;
py::tuple framelocals_names = code_framelocals_names(_code_obj);
PyObject* framelocals_names_ptr = framelocals_names.ptr();
PyCodeObject* co = (PyCodeObject*)_code_obj.ptr();

auto update_mapping = [&](int i) {
DEBUG_CHECK(0 <= i && i < _framelocals.size());
PyObject* value = _framelocals[i].ptr();
PyObject* name_ptr = PyTuple_GET_ITEM(framelocals_names_ptr, i);
if (value == nullptr) {
_dict.attr("pop")(framelocals_names[i], py::none());
if (name_ptr != nullptr && seen.count(name_ptr) != 0) {
_dict.attr("pop")(framelocals_names[i], py::none());
}
} else {
_dict[framelocals_names[i]] = value;
seen.insert(name_ptr);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, is there a guarantee that entries in framelocals_names with the same string value are the string object? If not, then the unordered_set should use Python string compare for its hash/equality? (We should also try to craft a test case that fails if this update is done incorrectly - I recall encountering failing tests when I made mistakes in the initial implementation, so I'm confused as to why the tests today don't seem to catch incorrect updates.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that was my concern as well. I don't know how to make that test case though.

}
};

Expand Down
Loading