diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-10-22 14:47:42 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-10-22 14:47:42 +0000 |
| commit | 41c45a9b319a5578e2731505ca3de2b9c50b4988 (patch) | |
| tree | 8bc5da0b8bcb62393a7f143611d6627b03589400 /src/libexpr/attr-path.cc | |
| parent | 64c3325b0bef8c0234bf797033e129323b36ad1e (diff) | |
* Store Value nodes outside of attribute sets. I.e., Attr now stores
a pointer to a Value, rather than the Value directly. This improves
the effectiveness of garbage collection a lot: if the Value is
stored inside the set directly, then any live pointer to the Value
causes all other attributes in the set to be live as well.
Diffstat (limited to 'src/libexpr/attr-path.cc')
| -rw-r--r-- | src/libexpr/attr-path.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libexpr/attr-path.cc b/src/libexpr/attr-path.cc index 0660ba1c1..365b03c0b 100644 --- a/src/libexpr/attr-path.cc +++ b/src/libexpr/attr-path.cc @@ -5,8 +5,9 @@ namespace nix { +// !!! Shouldn't we return a pointer to a Value? void findAlongAttrPath(EvalState & state, const string & attrPath, - const Bindings & autoArgs, Expr * e, Value & v) + Bindings & autoArgs, Expr * e, Value & v) { Strings tokens = tokenizeString(attrPath, "."); @@ -48,7 +49,7 @@ void findAlongAttrPath(EvalState & state, const string & attrPath, Bindings::iterator a = v.attrs->find(state.symbols.create(attr)); if (a == v.attrs->end()) throw Error(format("attribute `%1%' in selection path `%2%' not found") % attr % curPath); - v = a->second.value; + v = *a->second.value; } else if (apType == apIndex) { |