From b6809608cc467925db44b1eb435095c37e433255 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 5 Oct 2014 01:04:58 +0200 Subject: Get rid of some unnecessary ExprConcatStrings nodes in dynamic attrs This gives a ~18% speedup in NixOS evaluation (after converting most calls to hasAttr/getAttr to dynamic attrs). --- src/libexpr/eval.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/libexpr/eval.cc') diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 1eeb80989bd3..5122bd1453f9 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -701,13 +701,10 @@ void ExprAttrs::eval(EvalState & state, Env & env, Value & v) /* Dynamic attrs apply *after* rec and __overrides. */ foreach (DynamicAttrDefs::iterator, i, dynamicAttrs) { Value nameVal; - if (i->nameExpr->es->size() == 1) { - i->nameExpr->es->front()->eval(state, *dynamicEnv, nameVal); - state.forceValue(nameVal); - if (nameVal.type == tNull) - continue; - } i->nameExpr->eval(state, *dynamicEnv, nameVal); + state.forceValue(nameVal); + if (nameVal.type == tNull) + continue; state.forceStringNoCtx(nameVal); Symbol nameSym = state.symbols.create(nameVal.string.s); Bindings::iterator j = v.attrs->find(nameSym); -- cgit 1.4.1