From b8bed7da14b26dcc328075522842dd16aa71b434 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 16 Feb 2018 05:14:35 +0200 Subject: [PATCH] libexpr: Optimize prim_attrNames a bit Instead of having lexicographicOrder() create a temporary sorted array of Attr*:s and copying attr names from that, copy the attr names first and then sort that. --- src/libexpr/primops.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index ca97b2b28..89e984d2e 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -1138,8 +1138,11 @@ static void prim_attrNames(EvalState & state, const Pos & pos, Value * * args, V state.mkList(v, args[0]->attrs->size()); size_t n = 0; - for (auto & i : args[0]->attrs->lexicographicOrder()) - mkString(*(v.listElems()[n++] = state.allocValue()), i->name); + for (auto & i : *args[0]->attrs) + mkString(*(v.listElems()[n++] = state.allocValue()), i.name); + + std::sort(v.listElems(), v.listElems() + n, + [](Value * v1, Value * v2) { return strcmp(v1->string.s, v2->string.s) < 0; }); }