Merge pull request #11548 from DeterminateSystems/fix-zipAttrsWith-gc

Fix missing GC root in zipAttrsWith
NixOS · Sep 19, 2024 · ca3fc16 · ca3fc16
2 parents 9ea29ea + 4449b0d
commit ca3fc16
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
@@ -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;
+#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");