picnoir/Nix
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

prim_concatMap: allocate intermediate list on stack

Browse source
This commit is contained in:
volth 2018-07-05 12:37:37 +00:00 committed by GitHub
parent ee218f99ca
commit 841747b0e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/libexpr/primops.cc
View file

@ -1651,22 +1651,30 @@ static void prim_concatMap(EvalState & state, const Pos & pos, Value * * args, V
{
state.forceFunction(*args[0], pos);
state.forceList(*args[1], pos);
auto len = args[1]->listSize();
auto nrLists = args[1]->listSize();
Value vList;
state.mkList(vList, len);
Value lists[nrLists];
size_t len = 0;
for (unsigned int n = 0; n < len; ++n) {
for (unsigned int n = 0; n < nrLists; ++n) {
Value * vElem = args[1]->listElems()[n];
state.forceValue(*vElem);
state.callFunction(*args[0], *vElem, *(vList.listElems()[n] = state.allocValue()), pos);
state.callFunction(*args[0], *vElem, lists[n], pos);
state.forceList(lists[n], pos);
len += lists[n].listSize();
}
state.concatLists(v, len, vList.listElems(), pos);
state.mkList(v, len);
auto out = v.listElems();
for (unsigned int n = 0, pos = 0; n < nrLists; ++n) {
auto l = lists[n].listSize();
if (l)
memcpy(out + pos, lists[n].listElems(), l * sizeof(Value *));
pos += l;
}
}
/*************************************************************
* Integer arithmetic
*************************************************************/