diff options
-rw-r--r-- | third_party/nix/src/libexpr/eval.cc | 8 | ||||
-rw-r--r-- | third_party/nix/src/libexpr/eval.hh | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/third_party/nix/src/libexpr/eval.cc b/third_party/nix/src/libexpr/eval.cc index 0f3b7fabe029..16e6907214c9 100644 --- a/third_party/nix/src/libexpr/eval.cc +++ b/third_party/nix/src/libexpr/eval.cc @@ -338,8 +338,6 @@ EvalState::EvalState(const Strings& _searchPath, const ref<Store>& store) assert(gcInitialised); - static_assert(sizeof(Env) <= 16, "environment must be <= 16 bytes"); - /* Initialise the Nix expression search path. */ if (!evalSettings.pureEval) { Strings paths = parseNixPath(getEnv("NIX_PATH", "")); @@ -637,13 +635,9 @@ Env& EvalState::allocEnv(size_t size) { nrEnvs++; nrValuesInEnvs += size; - Env* env = (Env*)allocBytes(sizeof(Env) + size * sizeof(Value*)); - env->size = (decltype(Env::size))size; + Env* env = new Env(size); env->type = Env::Plain; - /* We assume that env->values has been cleared by the allocator; maybeThunk() - * and lookupVar fromWith expect this. */ - return *env; } diff --git a/third_party/nix/src/libexpr/eval.hh b/third_party/nix/src/libexpr/eval.hh index 11cc295b230d..3da0961b6f4a 100644 --- a/third_party/nix/src/libexpr/eval.hh +++ b/third_party/nix/src/libexpr/eval.hh @@ -3,6 +3,10 @@ #include <map> #include <optional> #include <unordered_map> +#include <vector> + +#include <gc/gc_allocator.h> +#include <gc/gc_cpp.h> #include "libexpr/attr-set.hh" #include "libexpr/nixexpr.hh" @@ -28,12 +32,16 @@ struct PrimOp { : fun(fun), arity(arity), name(name) {} }; -struct Env { +struct Env : public gc { + Env(unsigned short size) : size(size) { + values = std::vector<Value*, traceable_allocator<Value*>>(size); + } + Env* up; unsigned short size; // used by ‘valueSize’ unsigned short prevWith : 14; // nr of levels up to next `with' environment enum { Plain = 0, HasWithExpr, HasWithAttrs } type : 2; - Value* values[0]; + std::vector<Value*, traceable_allocator<Value*>> values; }; Value& mkString(Value& v, const std::string& s, |