[NFC] Move "HadAbnormalExit" Flag Into Compilation::Result

Author: CodaFi

include/swift/Driver/Compilation.h

@@ -80,6 +80,8 @@ using CommandSet = llvm::SmallPtrSet<const Job *, 16>;
 class Compilation {
 public:
   struct Result {
+    /// Set to true if any job exits abnormally (i.e. crashes).
+    bool hadAbnormalExit;
     int exitCode;
     fine_grained_dependencies::ModuleDepGraph depGraph;
   };
@@ -540,14 +542,11 @@ class Compilation {
 private:
   /// Perform all jobs.
   ///
-  /// \param[out] abnormalExit Set to true if any job exits abnormally (i.e.
-  /// crashes).
   /// \param TQ The task queue on which jobs will be scheduled.
   ///
   /// \returns exit code of the first failed Job, or 0 on success. If a Job
   /// crashes during execution, a negative value will be returned.
-  Compilation::Result performJobsImpl(bool &abnormalExit,
-                                      std::unique_ptr<sys::TaskQueue> &&TQ);
+  Compilation::Result performJobsImpl(std::unique_ptr<sys::TaskQueue> &&TQ);
 
   /// Performs a single Job by executing in place, if possible.
   ///

lib/Driver/Compilation.cpp

@@ -1945,8 +1945,7 @@ static bool writeFilelistIfNecessary(const Job *job, const ArgList &args,
 }
 
 Compilation::Result
-Compilation::performJobsImpl(bool &abnormalExit,
-                             std::unique_ptr<TaskQueue> &&TQ) {
+Compilation::performJobsImpl(std::unique_ptr<TaskQueue> &&TQ) {
   PerformJobsState State(*this, std::move(TQ));
 
   State.runJobs();
@@ -1956,13 +1955,11 @@ Compilation::performJobsImpl(bool &abnormalExit,
     State.populateInputInfoMap(InputInfo);
     checkForOutOfDateInputs(Diags, InputInfo);
 
-    abnormalExit = State.hadAnyAbnormalExit();
     auto result = std::move(State).takeResult();
     writeCompilationRecord(CompilationRecordPath, ArgsHash, BuildStartTime,
                            InputInfo);
     return result;
   } else {
-    abnormalExit = State.hadAnyAbnormalExit();
     return std::move(State).takeResult();
   }
 }
@@ -2062,15 +2059,14 @@ Compilation::Result Compilation::performJobs(std::unique_ptr<TaskQueue> &&TQ) {
     Diags.diagnose(SourceLoc(), diag::warning_parallel_execution_not_supported);
   }
 
-  bool abnormalExit;
-  auto result = performJobsImpl(abnormalExit, std::move(TQ));
+  auto result = performJobsImpl(std::move(TQ));
 
   if (IncrementalComparator)
     IncrementalComparator->outputComparison();
 
   if (!SaveTemps) {
     for (const auto &pathPair : TempFilePaths) {
-      if (!abnormalExit || pathPair.getValue() == PreserveOnSignal::No)
+      if (!result.hadAbnormalExit || pathPair.getValue() == PreserveOnSignal::No)
         (void)llvm::sys::fs::remove(pathPair.getKey());
     }
   }