maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix): ValueMap, VectorVector: Use traceable_allocator

Browse source 
We want to *trace* the 'Value *' arrays, not garbage-collect them!
Otherwise the vectors/maps can end up pointing to nowhere.

Backported from:
10e17eaa58

Change-Id: I30dc94caa80c9d982e7a14bc67ba2d065e8203aa
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1252
Tested-by: BuildkiteCI
Reviewed-by: isomer <isomer@tvl.fyi>
This commit is contained in:
Eelco Dolstra 2020-04-16 17:24:28 +02:00 • committed by tazjin
parent 5218c83b9f
commit 014436eb4a
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
third_party/nix/src/libexpr/value.hh vendored
View file

@ -242,9 +242,9 @@ void mkPath(Value& v, const char* s);
not included. */
size_t valueSize(Value& v);
typedef std::vector<Value*, gc_allocator<Value*> > ValueVector;
typedef std::vector<Value*, traceable_allocator<Value*>> ValueVector;
typedef std::map<Symbol, Value*, std::less<Symbol>,
gc_allocator<std::pair<const Symbol, Value*> > >
traceable_allocator<std::pair<const Symbol, Value*>>>
ValueMap;
} // namespace nix