DerivationBuildingGoal::initialOutputs make local variable

Also inline `assertPathValidity` in the process.

Author: Ericson2314

src/libstore/build/derivation-building-goal.cc

@@ -127,6 +127,8 @@ static void runPostBuildHook(
    produced using a substitute.  So we have to build instead. */
 Goal::Co DerivationBuildingGoal::gaveUpOnSubstitution()
 {
+    std::map<std::string, InitialOutput> initialOutputs;
+
     /* Recheck at goal start. In particular, whereas before we were
        given this information by the downstream goal, that cannot happen
        anymore if the downstream goal only cares about one output, but
@@ -150,7 +152,7 @@ Goal::Co DerivationBuildingGoal::gaveUpOnSubstitution()
             std::move(v),
         });
     }
-    checkPathValidity();
+    checkPathValidity(initialOutputs);
 
     Goals waitees;
 
@@ -531,7 +533,7 @@ Goal::Co DerivationBuildingGoal::gaveUpOnSubstitution()
            omitted, but that would be less efficient.)  Note that since we
            now hold the locks on the output paths, no other process can
            build this derivation, so no further checks are necessary. */
-        auto [allValid, validOutputs] = checkPathValidity();
+        auto [allValid, validOutputs] = checkPathValidity(initialOutputs);
 
         if (buildMode != bmCheck && allValid) {
             debug("skipping build of derivation '%s', someone beat us to it", worker.store.printStorePath(drvPath));
@@ -559,7 +561,7 @@ Goal::Co DerivationBuildingGoal::gaveUpOnSubstitution()
         if (buildLocally) {
             useHook = false;
         } else {
-            switch (tryBuildHook(inputPaths)) {
+            switch (tryBuildHook(inputPaths, initialOutputs)) {
             case rpAccept:
                 /* Yes, it has started doing so.  Wait until we get
                    EOF from the hook. */
@@ -647,8 +649,16 @@ Goal::Co DerivationBuildingGoal::gaveUpOnSubstitution()
 
                We can only early return when the outputs are known a priori. For
                floating content-addressing derivations this isn't the case.
+
+               Aborts if any output is not valid or corrupt, and otherwise
+               returns a 'SingleDrvOutputs' structure containing all outputs.
              */
-            assertPathValidity();
+            [&] {
+                auto [allValid, validOutputs] = checkPathValidity(initialOutputs);
+                if (!allValid)
+                    throw Error("some outputs are unexpectedly invalid");
+                return validOutputs;
+            }();
 
         StorePathSet outputPaths;
         for (auto & [_, output] : builtOutputs)
@@ -963,7 +973,8 @@ BuildError DerivationBuildingGoal::fixupBuilderFailureErrorMessage(BuilderFailur
     return BuildError{e.status, msg};
 }
 
-HookReply DerivationBuildingGoal::tryBuildHook(const StorePathSet & inputPaths)
+HookReply DerivationBuildingGoal::tryBuildHook(
+    const StorePathSet & inputPaths, const std::map<std::string, InitialOutput> & initialOutputs)
 {
 #ifdef _WIN32 // TODO enable build hook on Windows
     return rpDecline;
@@ -1242,7 +1253,8 @@ std::map<std::string, std::optional<StorePath>> DerivationBuildingGoal::queryPar
     return res;
 }
 
-std::pair<bool, SingleDrvOutputs> DerivationBuildingGoal::checkPathValidity()
+std::pair<bool, SingleDrvOutputs>
+DerivationBuildingGoal::checkPathValidity(std::map<std::string, InitialOutput> & initialOutputs)
 {
     if (drv->type().isImpure())
         return {false, {}};
@@ -1299,14 +1311,6 @@ std::pair<bool, SingleDrvOutputs> DerivationBuildingGoal::checkPathValidity()
     return {allValid, validOutputs};
 }
 
-SingleDrvOutputs DerivationBuildingGoal::assertPathValidity()
-{
-    auto [allValid, validOutputs] = checkPathValidity();
-    if (!allValid)
-        throw Error("some outputs are unexpectedly invalid");
-    return validOutputs;
-}
-
 Goal::Done DerivationBuildingGoal::doneSuccess(BuildResult::Status status, SingleDrvOutputs builtOutputs)
 {
     buildResult.status = status;

src/libstore/include/nix/store/build/derivation-building-goal.hh

@@ -43,8 +43,6 @@ struct DerivationBuildingGoal : public Goal
      * The remainder is state held during the build.
      */
 
-    std::map<std::string, InitialOutput> initialOutputs;
-
     /**
      * File descriptor for the log file.
      */
@@ -104,7 +102,8 @@ struct DerivationBuildingGoal : public Goal
     /**
      * Is the build hook willing to perform the build?
      */
-    HookReply tryBuildHook(const StorePathSet & inputPaths);
+    HookReply
+    tryBuildHook(const StorePathSet & inputPaths, const std::map<std::string, InitialOutput> & initialOutputs);
 
     /**
      * Open a log file and a pipe to it.
@@ -138,13 +137,7 @@ struct DerivationBuildingGoal : public Goal
      * whether all outputs are valid and non-corrupt, and a
      * 'SingleDrvOutputs' structure containing the valid outputs.
      */
-    std::pair<bool, SingleDrvOutputs> checkPathValidity();
-
-    /**
-     * Aborts if any output is not valid or corrupt, and otherwise
-     * returns a 'SingleDrvOutputs' structure containing all outputs.
-     */
-    SingleDrvOutputs assertPathValidity();
+    std::pair<bool, SingleDrvOutputs> checkPathValidity(std::map<std::string, InitialOutput> & initialOutputs);
 
     /**
      * Forcibly kill the child process, if any.