[BatchMode] Pass OutputInfo to Compilation on construction.

Author: graydon

include/swift/Driver/Compilation.h

@@ -17,6 +17,7 @@
 #ifndef SWIFT_DRIVER_COMPILATION_H
 #define SWIFT_DRIVER_COMPILATION_H
 
+#include "swift/Driver/Driver.h"
 #include "swift/Driver/Job.h"
 #include "swift/Driver/Util.h"
 #include "swift/Basic/ArrayRefView.h"
@@ -42,6 +43,7 @@ namespace swift {
 namespace driver {
   class Driver;
   class ToolChain;
+  class OutputInfo;
   class PerformJobsState;
 
 /// An enum providing different levels of output which should be produced
@@ -74,6 +76,11 @@ class Compilation {
   /// subsequent BatchJobs.
   LLVM_ATTRIBUTE_UNUSED const ToolChain &TheToolChain;
 
+  /// The OutputInfo, which the Compilation stores a copy of upon
+  /// construction, and which it may use to build subsequent batch
+  /// jobs itself.
+  OutputInfo TheOutputInfo;
+
   /// The OutputLevel at which this Compilation should generate output.
   OutputLevel Level;
 
@@ -182,6 +189,7 @@ class Compilation {
 
 public:
   Compilation(DiagnosticEngine &Diags, const ToolChain &TC,
+              OutputInfo const &OI,
               OutputLevel Level,
               std::unique_ptr<llvm::opt::InputArgList> InputArgs,
               std::unique_ptr<llvm::opt::DerivedArgList> TranslatedArgs,
@@ -195,6 +203,10 @@ class Compilation {
               std::unique_ptr<UnifiedStatsReporter> Stats = nullptr);
   ~Compilation();
 
+  OutputInfo const &getOutputInfo() const {
+    return TheOutputInfo;
+  }
+
   UnwrappedArrayView<const Action> getActions() const {
     return llvm::makeArrayRef(Actions);
   }

lib/Driver/Compilation.cpp

@@ -85,7 +85,9 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &os, const LogJobSet &ljs) {
 
 
 Compilation::Compilation(DiagnosticEngine &Diags,
-                         const ToolChain &TC, OutputLevel Level,
+                         const ToolChain &TC,
+                         OutputInfo const &OI,
+                         OutputLevel Level,
                          std::unique_ptr<InputArgList> InputArgs,
                          std::unique_ptr<DerivedArgList> TranslatedArgs,
                          InputFileList InputsWithTypes,
@@ -96,9 +98,11 @@ Compilation::Compilation(DiagnosticEngine &Diags,
                          bool SaveTemps,
                          bool ShowDriverTimeCompilation,
                          std::unique_ptr<UnifiedStatsReporter> StatsReporter)
-  : Diags(Diags), TheToolChain(TC), Level(Level),
+  : Diags(Diags), TheToolChain(TC),
+    TheOutputInfo(OI),
+    Level(Level),
     RawInputArgs(std::move(InputArgs)),
-    TranslatedArgs(std::move(TranslatedArgs)), 
+    TranslatedArgs(std::move(TranslatedArgs)),
     InputFilesWithTypes(std::move(InputsWithTypes)), ArgsHash(ArgsHash),
     BuildStartTime(StartTime),
     NumberOfParallelCommands(NumberOfParallelCommands),

lib/Driver/Driver.cpp

@@ -672,7 +672,7 @@ Driver::buildCompilation(const ToolChain &TC,
       llvm_unreachable("Unknown OutputLevel argument!");
   }
 
-  std::unique_ptr<Compilation> C(new Compilation(Diags, TC, Level,
+  std::unique_ptr<Compilation> C(new Compilation(Diags, TC, OI, Level,
                                                  std::move(ArgList),
                                                  std::move(TranslatedArgList),
                                                  std::move(Inputs),