From 6bb4c0b712788c9cec9a1721ceb3c3a5c89c4181 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Oct 2014 13:08:53 +0200 Subject: mkList: Scrub better MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Clearing v.app.right was not enough, because the length field of a list only takes 32 bits, so the most significant 32 bits of v.app.left (a.k.a. v.thunk.env) would remain. This could cause Boehm GC to interpret it as a valid pointer. This change reduces maximum RSS for evaluating the ‘tested’ job in nixos/release-small.nix from 1.33 GiB to 0.80 GiB, and runtime by about 8%. --- src/libexpr/eval.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libexpr/eval.cc') diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 5122bd1453f9..5b9db6eeaa6e 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -455,6 +455,7 @@ Bindings * EvalState::allocBindings(Bindings::size_t capacity) void EvalState::mkList(Value & v, unsigned int length) { + clearValue(v); v.type = tList; v.list.length = length; v.list.elems = length ? (Value * *) GC_MALLOC(length * sizeof(Value *)) : 0; -- cgit 1.4.1