Skip to content
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

Jump to bottom

Fix missing GC root in zipAttrsWith #11548

Merged
merged 2 commits into from
Sep 19, 2024
Merged

Fix missing GC root in zipAttrsWith #11548

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c2fdd2
Fix missing GC root in zipAttrsWith
edolstra Sep 19, 2024
4449b0d
Use HAVE_BOEHMGC
edolstra Sep 19, 2024
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
4 changes: 4 additions & 0 deletions src/libexpr/primops.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3136,7 +3136,11 @@ static void prim_zipAttrsWith(EvalState & state, const PosIdx pos, Value * * arg
std::optional<ListBuilder> list;
};

#if HAVE_BOEHMGC
std::map<Symbol, Item, std::less<Symbol>, traceable_allocator<std::pair<const Symbol, Item>>> attrsSeen;
edolstra marked this conversation as resolved.
Show resolved Hide resolved
#else
std::map<Symbol, Item> attrsSeen;
#endif

state.forceFunction(*args[0], pos, "while evaluating the first argument passed to builtins.zipAttrsWith");
state.forceList(*args[1], pos, "while evaluating the second argument passed to builtins.zipAttrsWith");
Expand Down
Loading