alois31/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #2302 from volth/patch-3

Browse source 
prim_foldlStrict: call forceValue() before value is copied
This commit is contained in:
Eelco Dolstra 2018-07-23 09:19:05 +02:00 committed by GitHub
parent 1b34b69b45 e2b114cfe1
commit 925053e974
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libexpr/primops.cc
View file

@ -1508,19 +1508,20 @@ static void prim_foldlStrict(EvalState & state, const Pos & pos, Value * * args,
state.forceFunction(*args[0], pos); state.forceFunction(*args[0], pos);
state.forceList(*args[2], pos); state.forceList(*args[2], pos);
Value * vCur = args[1]; if (args[2]->listSize()) {
Value * vCur = args[1];
if (args[2]->listSize())
for (unsigned int n = 0; n < args[2]->listSize(); ++n) { for (unsigned int n = 0; n < args[2]->listSize(); ++n) {
Value vTmp; Value vTmp;
state.callFunction(*args[0], *vCur, vTmp, pos); state.callFunction(*args[0], *vCur, vTmp, pos);
vCur = n == args[2]->listSize() - 1 ? &v : state.allocValue(); vCur = n == args[2]->listSize() - 1 ? &v : state.allocValue();
state.callFunction(vTmp, *args[2]->listElems()[n], *vCur, pos); state.callFunction(vTmp, *args[2]->listElems()[n], *vCur, pos);
} }
else state.forceValue(v);
v = *vCur; } else {
state.forceValue(*args[1]);
state.forceValue(v); v = *args[1];
}
} }