From d2c371927e45c1d4e4f7e4ad331a3f68d67d5469 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 13 Apr 2020 21:09:47 +0200
Subject: SourceExprCommand: allocate the vSourceExpr via uncollectable memory

Previously the memory would occasionally be collected during eval since
the GC doesn't consider the member variable as alive / doesn't scan the
region of memory where the pointer lives.

By using the traceable_allocator<T> allocator provided by Boehm GC we
can ensure the memory isn't collected. It should be properly freed when
SourceExprCommand goes out of scope.
---
 src/nix/installables.cc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/nix/installables.cc')

diff --git a/src/nix/installables.cc b/src/nix/installables.cc
index f464d0aa1..902383bff 100644
--- a/src/nix/installables.cc
+++ b/src/nix/installables.cc
@@ -8,10 +8,13 @@
 #include "store-api.hh"
 #include "shared.hh"
 
+#include <gc/gc.h>
+
 #include <regex>
 
 namespace nix {
 
+
 SourceExprCommand::SourceExprCommand()
 {
     mkFlag()
@@ -24,11 +27,14 @@ SourceExprCommand::SourceExprCommand()
 
 Value * SourceExprCommand::getSourceExpr(EvalState & state)
 {
-    if (vSourceExpr) return vSourceExpr;
+    if (vSourceExpr) return vSourceExpr.get();
 
     auto sToplevel = state.symbols.create("_toplevel");
 
-    vSourceExpr = state.allocValue();
+    // Allocate the vSourceExpr Value as uncollectable. Boehm GC doesn't
+    // consider the member variable "alive" during execution causing it to be
+    // GC'ed in the middle of evaluation.
+    vSourceExpr = std::allocate_shared<Value>(traceable_allocator<Value>());
 
     if (file != "")
         state.evalFile(lookupFileArg(state, file), *vSourceExpr);
@@ -69,7 +75,7 @@ Value * SourceExprCommand::getSourceExpr(EvalState & state)
         vSourceExpr->attrs->sort();
     }
 
-    return vSourceExpr;
+    return vSourceExpr.get();
 }
 
 ref<EvalState> SourceExprCommand::getEvalState()
-- 
cgit v1.2.3