From cb2633feafacc605181f2582fdefe9b6cc35725c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 22 Jul 2024 15:10:47 +0200
Subject: [PATCH] addToStore(): Do evaluation on the main stack

This hopefully avoids the need for all our Boehm GC coroutine
workarounds, since the GC roots will be on the main stack of the
thread.

Fixes #11141.

(cherry picked from commit 048271ea803657a4cc664b5c7a79a89f7ffc9457)
---
 src/libstore/local-store.cc |  1 +
 src/libstore/store-api.cc   | 16 +++++++++-------
 src/libutil/serialise.cc    |  8 ++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 2b4e01eb3ba6..1740583ee385 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -1242,6 +1242,7 @@ StorePath LocalStore::addToStoreFromDump(
         });
         try {
             got = source.read(dumpBuffer.get() + oldSize, want);
+            if (!got) break;
         } catch (EndOfFile &) {
             inMemory = true;
             break;
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 05c4e1c5e8fd..42aabf02ea2b 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -208,14 +208,16 @@ StorePath Store::addToStore(
         fsm = FileSerialisationMethod::NixArchive;
         break;
     }
-    auto source = sinkToSource([&](Sink & sink) {
-        dumpPath(path, sink, fsm, filter);
+    std::optional<StorePath> storePath;
+    auto sink = sourceToSink([&](Source & source) {
+        LengthSource lengthSource(source);
+        storePath = addToStoreFromDump(lengthSource, name, fsm, method, hashAlgo, references, repair);
+        if (lengthSource.total >= settings.warnLargePathThreshold)
+            warn("copied large path '%s' to the store (%s)", path, renderSize(lengthSource.total));
     });
-    LengthSource lengthSource(*source);
-    auto storePath = addToStoreFromDump(lengthSource, name, fsm, method, hashAlgo, references, repair);
-    if (lengthSource.total >= settings.warnLargePathThreshold)
-        warn("copied large path '%s' to the store (%s)", path, renderSize(lengthSource.total));
-    return storePath;
+    dumpPath(path, *sink, fsm, filter);
+    sink->finish();
+    return storePath.value();
 }
 
 void Store::addMultipleToStore(
diff --git a/src/libutil/serialise.cc b/src/libutil/serialise.cc
index 36b99905aab5..0f2febaed67b 100644
--- a/src/libutil/serialise.cc
+++ b/src/libutil/serialise.cc
@@ -243,11 +243,11 @@ std::unique_ptr<FinishSink> sourceToSink(std::function<void(Source &)> fun)
             if (!coro) {
                 CoroutineContext ctx;
                 coro = coro_t::push_type(VirtualStackAllocator{}, [&](coro_t::pull_type & yield) {
-                    LambdaSource source([&](char *out, size_t out_len) {
+                    LambdaSource source([&](char * out, size_t out_len) {
                         if (cur.empty()) {
                             yield();
                             if (yield.get()) {
-                                return (size_t)0;
+                                return (size_t) 0;
                             }
                         }
 
@@ -271,12 +271,12 @@ std::unique_ptr<FinishSink> sourceToSink(std::function<void(Source &)> fun)
         void finish() override
         {
             if (!coro) return;
-            if (!*coro) abort();
+            //if (!*coro) abort();
             {
                 CoroutineContext ctx;
                 (*coro)(true);
             }
-            if (*coro) abort();
+            //if (*coro) abort();
         }
     };