From 770034042a3e7cb7f3a9f7a271ab45e44b0d006c Mon Sep 17 00:00:00 2001
From: Kane York <kanepyork@gmail.com>
Date: Fri, 31 Jul 2020 15:12:11 -0700
Subject: fix(3p/nix): Use a proper pointer in Env to carry with-attrs

This eliminates the value-smuggling that would trip up the GC.

Change-Id: I8057df78cf0bf6bea9faf1b44233aa9820ae44f5
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1504
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
---
 third_party/nix/src/libexpr/eval.hh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'third_party/nix/src/libexpr/eval.hh')

diff --git a/third_party/nix/src/libexpr/eval.hh b/third_party/nix/src/libexpr/eval.hh
index 199253bc451b..2c285ed5c111 100644
--- a/third_party/nix/src/libexpr/eval.hh
+++ b/third_party/nix/src/libexpr/eval.hh
@@ -42,6 +42,7 @@ struct Env : public gc {
   unsigned short prevWith : 14;  // nr of levels up to next `with' environment
   enum { Plain = 0, HasWithExpr, HasWithAttrs } type : 2;
   std::vector<Value*, traceable_allocator<Value*>> values;
+  Expr* withAttrsExpr = nullptr;
 };
 
 Value& mkString(Value& v, const std::string& s,
-- 
cgit 1.4.1