Merge pull request #14198 from davidungar/PR-18-3c-exp2

[Batch mode] Move frontend main output files to FrontendInputsAndOutputs. (1)

Author: David Ungar

include/swift/AST/DiagnosticsFrontend.def

@@ -150,6 +150,9 @@ ERROR(error_implicit_output_file_is_directory,none,
   "the implicit output file '%0' is a directory; explicitly specify a filename "
   "using -o", (StringRef))
 
+ERROR(error_if_any_output_files_are_specified_they_all_must_be,none,
+  "if any output files are specified, they all must be", ())
+
 ERROR(error_primary_file_not_found,none,
       "primary file '%0' was not found in file list '%1'",
       (StringRef, StringRef))

include/swift/AST/IRGenOptions.h

@@ -190,6 +190,11 @@ class IRGenOptions {
 
   /// Gets the name of the specified output filename.
   /// If multiple files are specified, the last one is returned.
+  /// This function is used by (at least)
+  /// lldb/source/Symbol/SwiftASTContext.cpp:4603
+  /// FIXME: This function should go away in favor of
+  /// Instance.getFrontendOptions().InputsAndOutputs.getSingleOutputFilename
+  /// when batch mode handles all contingencies.
   StringRef getSingleOutputFilename() const {
     if (OutputFilenames.size() >= 1)
       return OutputFilenames.back();

include/swift/Frontend/ArgsToFrontendInputsConverter.h

@@ -42,7 +42,7 @@ namespace swift {
 class ArgsToFrontendInputsConverter {
   DiagnosticEngine &Diags;
   const llvm::opt::ArgList &Args;
-  FrontendInputs &Inputs;
+  FrontendInputsAndOutputs &InputsAndOutputs;
 
   llvm::opt::Arg const *const FilelistPathArg;
   llvm::opt::Arg const *const PrimaryFilelistPathArg;
@@ -54,7 +54,7 @@ class ArgsToFrontendInputsConverter {
 public:
   ArgsToFrontendInputsConverter(DiagnosticEngine &diags,
                                 const llvm::opt::ArgList &args,
-                                FrontendInputs &inputs);
+                                FrontendInputsAndOutputs &inputsAndOutputs);
 
   bool convert();
 
@@ -69,6 +69,8 @@ class ArgsToFrontendInputsConverter {
   std::set<StringRef>
   createInputFilesConsumingPrimaries(std::set<StringRef> primaryFiles);
   bool checkForMissingPrimaryFiles(std::set<StringRef> primaryFiles);
+
+  bool isSingleThreadedWMO() const;
 };
 
 } // namespace swift

include/swift/Frontend/ArgsToFrontendOptionsConverter.h

@@ -50,34 +50,13 @@ class ArgsToFrontendOptionsConverter {
   void setUnsignedIntegerArgument(options::ID optionID, unsigned max,
                                   unsigned &valueToSet);
 
-  FrontendOptions::ActionType determineRequestedAction() const;
-
   bool setUpForSILOrLLVM();
 
-  /// Determine the correct output filename when none was specified.
-  ///
-  /// Such an absence should only occur when invoking the frontend
-  /// without the driver,
-  /// because the driver will always pass -o with an appropriate filename
-  /// if output is required for the requested action.
-  bool deriveOutputFilenameFromInputFile();
-
-  /// Determine the correct output filename when a directory was specified.
-  ///
-  /// Such a specification should only occur when invoking the frontend
-  /// directly, because the driver will always pass -o with an appropriate
-  /// filename if output is required for the requested action.
-  bool deriveOutputFilenameForDirectory(StringRef outputDir);
-
-  std::string determineBaseNameOfOutput() const;
-
-  void deriveOutputFilenameFromParts(StringRef dir, StringRef base);
-
   void determineSupplementaryOutputFilenames();
 
-  /// Returns the output filenames on the command line or in the output
-  /// filelist. If there
-  /// were neither -o's nor an output filelist, returns an empty vector.
+  /// \returns the output filenames on the command line or in the output
+  /// filelist, or an empty vector if there were neither -o's nor an output
+  /// filelist.
   ArrayRef<std::string> getOutputFilenamesFromCommandLineOrFilelist();
 
   bool checkForUnusedOutputPaths() const;
@@ -91,6 +70,9 @@ class ArgsToFrontendOptionsConverter {
       : Diags(Diags), Args(Args), Opts(Opts) {}
 
   bool convert();
+
+  static FrontendOptions::ActionType
+  determineRequestedAction(const llvm::opt::ArgList &);
 };
 
 } // namespace swift

include/swift/Frontend/ArgsToFrontendOutputsConverter.h

@@ -0,0 +1,113 @@
+//===--- ArgsToFrontendOutputsConverter.h -----------------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2018 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
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_FRONTEND_ARGSTOFRONTENDOUTPUTSCONVERTER_H
+#define SWIFT_FRONTEND_ARGSTOFRONTENDOUTPUTSCONVERTER_H
+
+#include "swift/AST/DiagnosticConsumer.h"
+#include "swift/AST/DiagnosticEngine.h"
+#include "swift/Basic/LLVM.h"
+#include "swift/Frontend/FrontendOptions.h"
+#include "swift/Option/Options.h"
+#include "llvm/Option/ArgList.h"
+
+#include <vector>
+
+namespace swift {
+
+/// Given the command line arguments and information about the inputs,
+/// Fill in all the information in FrontendInputsAndOutputs.
+
+class ArgsToFrontendOutputsConverter {
+  const llvm::opt::ArgList &Args;
+  StringRef ModuleName;
+  FrontendInputsAndOutputs &InputsAndOutputs;
+  DiagnosticEngine &Diags;
+
+public:
+  ArgsToFrontendOutputsConverter(const llvm::opt::ArgList &args,
+                                 StringRef moduleName,
+                                 FrontendInputsAndOutputs &inputsAndOutputs,
+                                 DiagnosticEngine &diags)
+      : Args(args), ModuleName(moduleName), InputsAndOutputs(inputsAndOutputs),
+        Diags(diags) {}
+
+  Optional<std::vector<std::string>> convert();
+
+  /// Try to read an output file list file.
+  /// \returns `None` if it could not open the filelist.
+  static Optional<std::vector<std::string>>
+  readOutputFileList(StringRef filelistPath, DiagnosticEngine &diags);
+};
+
+class OutputFilesComputer {
+  const llvm::opt::ArgList &Args;
+  DiagnosticEngine &Diags;
+  const FrontendInputsAndOutputs &InputsAndOutputs;
+  const std::vector<std::string> OutputFileArguments;
+  const std::string OutputDirectoryArgument;
+  const StringRef FirstInput;
+  const FrontendOptions::ActionType RequestedAction;
+  const llvm::opt::Arg *const ModuleNameArg;
+  const StringRef Suffix;
+  const bool HasTextualOutput;
+
+  OutputFilesComputer(const llvm::opt::ArgList &args, DiagnosticEngine &diags,
+                      const FrontendInputsAndOutputs &inputsAndOutputs,
+                      std::vector<std::string> outputFileArguments,
+                      StringRef outputDirectoryArgument, StringRef firstInput,
+                      FrontendOptions::ActionType requestedAction,
+                      const llvm::opt::Arg *moduleNameArg, StringRef suffix,
+                      bool hasTextualOutput);
+
+public:
+  static Optional<OutputFilesComputer>
+  create(const llvm::opt::ArgList &args, DiagnosticEngine &diags,
+         const FrontendInputsAndOutputs &inputsAndOutputs);
+
+  /// \return the output filenames on the command line or in the output
+  /// filelist. If there
+  /// were neither -o's nor an output filelist, returns an empty vector.
+  static Optional<std::vector<std::string>>
+  getOutputFilenamesFromCommandLineOrFilelist(const llvm::opt::ArgList &args,
+                                              DiagnosticEngine &diags);
+
+  Optional<std::vector<std::string>> computeOutputFiles() const;
+
+private:
+  Optional<std::string> computeOutputFile(StringRef outputArg,
+                                          const InputFile &input) const;
+
+  /// \return the correct output filename when none was specified.
+  ///
+  /// Such an absence should only occur when invoking the frontend
+  /// without the driver,
+  /// because the driver will always pass -o with an appropriate filename
+  /// if output is required for the requested action.
+  Optional<std::string> deriveOutputFileFromInput(const InputFile &input) const;
+
+  /// \return the correct output filename when a directory was specified.
+  ///
+  /// Such a specification should only occur when invoking the frontend
+  /// directly, because the driver will always pass -o with an appropriate
+  /// filename if output is required for the requested action.
+  Optional<std::string>
+  deriveOutputFileForDirectory(const InputFile &input) const;
+
+  std::string determineBaseNameOfOutput(const InputFile &input) const;
+
+  std::string deriveOutputFileFromParts(StringRef dir, StringRef base) const;
+};
+
+} // namespace swift
+
+#endif /* SWIFT_FRONTEND_ARGSTOFRONTENDOUTPUTSCONVERTER_H */

include/swift/Frontend/Frontend.h

@@ -54,7 +54,7 @@ class SerializedModuleLoader;
 ///   - options for all stages of translation,
 ///   - information about the build environment,
 ///   - information about the job being performed, and
-///   - lists of inputs.
+///   - lists of inputs and outputs.
 ///
 /// A CompilerInvocation can be built from a frontend command line
 /// using parseArgs.  It can then be used to build a CompilerInstance,
@@ -245,7 +245,7 @@ class CompilerInvocation {
 
 
   StringRef getOutputFilename() const {
-    return FrontendOpts.getSingleOutputFilename();
+    return FrontendOpts.InputsAndOutputs.getSingleOutputFilename();
   }
 
   void setCodeCompletionPoint(llvm::MemoryBuffer *Buf, unsigned Offset) {