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

Memoize evalFile() lookups under both the original and resolved name

Browse source 
Previously we only used the resolved name, causing repeated resolution
(e.g. /dir to /dir/default.nix).
This commit is contained in:
Eelco Dolstra 2013-10-23 11:16:46 +00:00
parent 3139481822
commit fe95650487
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libexpr/eval.cc
View file

@ -436,10 +436,14 @@ Value * ExprPath::maybeThunk(EvalState & state, Env & env)
void EvalState::evalFile(const Path & path, Value & v)
{
Path path2 = resolveExprPath(path);
FileEvalCache::iterator i;
if ((i = fileEvalCache.find(path)) != fileEvalCache.end()) {
v = i->second;
return;
}
FileEvalCache::iterator i = fileEvalCache.find(path2);
if (i != fileEvalCache.end()) {
Path path2 = resolveExprPath(path);
if ((i = fileEvalCache.find(path2)) != fileEvalCache.end()) {
v = i->second;
return;
}
@ -452,8 +456,9 @@ void EvalState::evalFile(const Path & path, Value & v)
addErrorPrefix(e, "while evaluating the file `%1%':\n", path2);
throw;
}
fileEvalCache[path2] = v;
//if (path != path2) fileEvalCache[path2] = v;
if (path != path2) fileEvalCache[path] = v;
}