Add support for emitting parseable-outpuit "began" message from swift-frontend

Author: artemcm

include/swift/Basic/ParseableOutput.h

@@ -1,8 +1,8 @@
-//===--- ParseableOutput.h - Helpers for parseable output -------*- C++ -*-===//
+//===----- ParseableOutput.h - Helpers for parseable output ------- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
@@ -11,43 +11,50 @@
 //===----------------------------------------------------------------------===//
 ///
 /// \file
-/// Helpers for emitting the driver's parseable output.
+/// Helpers for emitting the compiler's parseable output.
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_DRIVER_PARSEABLEOUTPUT_H
-#define SWIFT_DRIVER_PARSEABLEOUTPUT_H
+#ifndef SWIFT_PARSEABLEOUTPUT_H
+#define SWIFT_PARSEABLEOUTPUT_H
 
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/TaskQueue.h"
+#include "swift/Frontend/Frontend.h"
+#include "swift/Driver/Job.h"
 
 namespace swift {
-namespace driver {
 
-class Job;
 
 namespace parseable_output {
 
-/// Emits a "began" message to the given stream.
-void emitBeganMessage(raw_ostream &os, const Job &Cmd, int64_t Pid,
+/// Emits a "began" message to the given stream, corresponding to a Driver Job.
+void emitBeganMessage(raw_ostream &os, const driver::Job &Cmd, int64_t Pid,
+                      sys::TaskProcessInformation ProcInfo);
+
+/// Emits a "began" message to the given stream, corresponding to a given Frontend
+/// Compiler Invocation.
+void emitBeganMessage(raw_ostream &os,
+                      const CompilerInvocation &Invocation,
+                      ArrayRef<const char *> Args,
+                      int64_t Pid,
                       sys::TaskProcessInformation ProcInfo);
 
 /// Emits a "finished" message to the given stream.
-void emitFinishedMessage(raw_ostream &os, const Job &Cmd, int64_t Pid,
+void emitFinishedMessage(raw_ostream &os, const driver::Job &Cmd, int64_t Pid,
                          int ExitStatus, StringRef Output,
                          sys::TaskProcessInformation ProcInfo);
 
 /// Emits a "signalled" message to the given stream.
-void emitSignalledMessage(raw_ostream &os, const Job &Cmd, int64_t Pid,
+void emitSignalledMessage(raw_ostream &os, const driver::Job &Cmd, int64_t Pid,
                           StringRef ErrorMsg, StringRef Output,
                           Optional<int> Signal,
                           sys::TaskProcessInformation ProcInfo);
 
 /// Emits a "skipped" message to the given stream.
-void emitSkippedMessage(raw_ostream &os, const Job &Cmd);
+void emitSkippedMessage(raw_ostream &os, const driver::Job &Cmd);
 
 } // end namespace parseable_output
-} // end namespace driver
 } // end namespace swift
 
 #endif

include/swift/Basic/SupplementaryOutputPaths.h

@@ -14,6 +14,7 @@
 #define SWIFT_FRONTEND_SUPPLEMENTARYOUTPUTPATHS_H
 
 #include "swift/Basic/LLVM.h"
+#include "llvm/IR/Function.h"
 
 #include <string>
 
@@ -171,6 +172,42 @@ struct SupplementaryOutputPaths {
   SupplementaryOutputPaths() = default;
   SupplementaryOutputPaths(const SupplementaryOutputPaths &) = default;
 
+  /// Apply a given function for each existing (non-empty string) supplementary output
+  void forEachSetOutput(llvm::function_ref<void(const std::string&)> fn) const {
+    if (!ObjCHeaderOutputPath.empty())
+      fn(ObjCHeaderOutputPath); 
+    if (!ModuleOutputPath.empty())
+      fn(ModuleOutputPath); 
+    if (!ModuleSourceInfoOutputPath.empty())
+      fn(ModuleSourceInfoOutputPath); 
+    if (!ModuleDocOutputPath.empty())
+      fn(ModuleDocOutputPath); 
+    if (!DependenciesFilePath.empty())
+      fn(DependenciesFilePath); 
+    if (!ReferenceDependenciesFilePath.empty())
+      fn(ReferenceDependenciesFilePath); 
+    if (!SwiftRangesFilePath.empty())
+      fn(SwiftRangesFilePath); 
+    if (!CompiledSourceFilePath.empty())
+      fn(CompiledSourceFilePath); 
+    if (!SerializedDiagnosticsPath.empty())
+      fn(SerializedDiagnosticsPath); 
+    if (!FixItsOutputPath.empty())
+      fn(FixItsOutputPath); 
+    if (!LoadedModuleTracePath.empty())
+      fn(LoadedModuleTracePath); 
+    if (!TBDPath.empty())
+      fn(TBDPath); 
+    if (!ModuleInterfaceOutputPath.empty())
+      fn(ModuleInterfaceOutputPath); 
+    if (!PrivateModuleInterfaceOutputPath.empty())
+      fn(PrivateModuleInterfaceOutputPath); 
+    if (!LdAddCFilePath.empty())
+      fn(LdAddCFilePath); 
+    if (!ModuleSummaryOutputPath.empty())
+      fn(ModuleSummaryOutputPath); 
+  }
+
   bool empty() const {
     return ObjCHeaderOutputPath.empty() && ModuleOutputPath.empty() &&
            ModuleDocOutputPath.empty() && DependenciesFilePath.empty() &&