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

refactor(3p/tvix): convert NixList usage to shared_ptr

Browse source 
Starting to reclaim memory. Fairly simple mechanical replacement.

Change-Id: I6b4c5c5596729470d1a049eba61e69e8097decf4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1971
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
Kane York 2020-09-12 08:09:18 -07:00 • committed by kanepyork
parent 381ce8a666
commit 2c19bd6662
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
third_party/nix/src/libexpr/primops.cc vendored
View file

@ -1603,7 +1603,7 @@ static void prim_sort(EvalState& state, const Pos& pos, Value** args,
// Copy of the input list which can be sorted in place.
v.type = tList;
v.list = new NixList(*args[1]->list);
v.list = std::make_shared<NixList>(*args[1]->list);
std::for_each(v.list->begin(), v.list->end(),
[&](Value* val) { state.forceValue(*val); });
@ -1633,8 +1633,8 @@ static void prim_partition(EvalState& state, const Pos& pos, Value** args,
state.forceFunction(*args[0], pos);
state.forceList(*args[1], pos);
NixList* right = new NixList();
NixList* wrong = new NixList();
std::shared_ptr<NixList> right = std::make_shared<NixList>();
std::shared_ptr<NixList> wrong = std::make_shared<NixList>();
for (Value* elem : *args[1]->list) {
state.forceValue(*elem, pos);
@ -1664,7 +1664,7 @@ static void prim_concatMap(EvalState& state, const Pos& pos, Value** args,
state.forceFunction(*args[0], pos);
state.forceList(*args[1], pos);
NixList* outlist = new NixList;
std::shared_ptr<NixList> outlist = std::make_shared<NixList>();
for (Value* elem : *args[1]->list) {
auto out = state.allocValue();