nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-20 01:09:37 +01:00
Code Activity

Properly fill the cache in case of a miss/forward

Browse source
This commit is contained in:
regnat 2021-06-03 15:27:03 +02:00
parent 8787218c7c
commit b39ab10749
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libexpr/eval.cc
View file

@ -1199,7 +1199,9 @@ bool EvalState::getAttrField(Value & attrs, const std::vector<Symbol> & selector
if (cacheResult.lastQueriedSymbolIfMissing) if (cacheResult.lastQueriedSymbolIfMissing)
return false; return false;
return true; return true;
case ValueCache::CacheMiss: // FIXME: Handle properly case ValueCache::CacheMiss:
resultingCursor = eval_cache;
break;
case ValueCache::Forward: // FIXME: Handle properly case ValueCache::Forward: // FIXME: Handle properly
case ValueCache::NoCacheKey: case ValueCache::NoCacheKey:
case ValueCache::UnCacheable: case ValueCache::UnCacheable:
@ -1234,6 +1236,9 @@ bool EvalState::getAttrField(Value & attrs, const std::vector<Symbol> & selector
throw; throw;
} }
if (cacheResult.returnCode == ValueCache::Forward)
vAttrs->setEvalCache(resultingCursor);
dest = *vAttrs; dest = *vAttrs;
return true; return true;
} }