Remove cleanup from goal

Author: L-as

src/libstore/build/goal.cc

@@ -193,8 +193,6 @@ Goal::Done Goal::amDone(ExitCode result, std::optional<Error> ex)
     waiters.clear();
     worker.removeGoal(shared_from_this());
 
-    cleanup();
-
     // We drop the continuation.
     // In `final_awaiter` this will signal that there is no more work to be done.
     top_co->handle.promise().continuation = {};

src/libstore/build/goal.hh

@@ -364,8 +364,6 @@ protected:
     Done amDone(ExitCode result, std::optional<Error> ex = {});
 
 public:
-    virtual void cleanup() { }
-
     /**
      * Project a `BuildResult` with just the information that pertains
      * to the given request.

src/libstore/build/substitution-goal.cc

@@ -35,6 +35,7 @@ Goal::Done PathSubstitutionGoal::done(
         debug(*errorMsg);
         buildResult.errorMsg = *errorMsg;
     }
+    cleanup();
     return amDone(result);
 }
 

src/libstore/build/substitution-goal.hh

@@ -69,8 +69,7 @@ public:
     Co tryToRun(StorePath subPath, nix::ref<Store> sub, std::shared_ptr<const ValidPathInfo> info, bool & substituterFailed);
     Co finished();
 
-    /* Called by destructor, can't be overridden */
-    void cleanup() override final;
+    void cleanup();
 
     JobCategory jobCategory() const override {
         return JobCategory::Substitution;