Replace the swift-dependency-tool binary with a symlink to swift-frontend

rdar://76551283

Author: eeckstein

include/swift/Driver/Driver.h

@@ -171,6 +171,7 @@ class Driver {
     SILNM,           // sil-nm
     SILLLVMGen,      // sil-llvm-gen
     SILPassPipelineDumper, // sil-passpipeline-dumper
+    SwiftDependencyTool,   // swift-dependency-tool
     AutolinkExtract, // swift-autolink-extract
     SwiftIndent,     // swift-indent
     SymbolGraph,     // swift-symbolgraph

lib/Driver/Driver.cpp

@@ -104,6 +104,7 @@ void Driver::parseDriverKind(ArrayRef<const char *> Args) {
           .Case("sil-nm", DriverKind::SILNM)
           .Case("sil-llvm-gen", DriverKind::SILLLVMGen)
           .Case("sil-passpipeline-dumper", DriverKind::SILPassPipelineDumper)
+          .Case("swift-dependency-tool", DriverKind::SwiftDependencyTool)
           .Case("swift-autolink-extract", DriverKind::AutolinkExtract)
           .Case("swift-indent", DriverKind::SwiftIndent)
           .Case("swift-symbolgraph-extract", DriverKind::SymbolGraph)
@@ -3565,6 +3566,7 @@ void Driver::printHelp(bool ShowHidden) const {
   case DriverKind::SILNM:
   case DriverKind::SILLLVMGen:
   case DriverKind::SILPassPipelineDumper:
+  case DriverKind::SwiftDependencyTool:
   case DriverKind::AutolinkExtract:
   case DriverKind::SwiftIndent:
   case DriverKind::SymbolGraph:

lib/DriverTool/CMakeLists.txt

@@ -5,6 +5,7 @@ set(driver_sources_and_options
                 sil_nm_main.cpp
                 sil_llvm_gen_main.cpp
                 sil_passpipeline_dumper_main.cpp
+                swift_dependency_tool_main.cpp
                 autolink_extract_main.cpp
                 modulewrap_main.cpp
                 swift_api_digester_main.cpp

lib/DriverTool/driver.cpp

@@ -78,6 +78,9 @@ extern int sil_llvm_gen_main(ArrayRef<const char *> argv, void *MainAddr);
 /// Run 'sil-passpipeline-dumper'
 extern int sil_passpipeline_dumper_main(ArrayRef<const char *> argv, void *MainAddr);
 
+/// Run 'swift-dependency-tool'
+extern int swift_dependency_tool_main(ArrayRef<const char *> argv, void *MainAddr);
+
 /// Run 'swift-autolink-extract'.
 extern int autolink_extract_main(ArrayRef<const char *> Args, const char *Argv0,
                                  void *MainAddr);
@@ -306,6 +309,8 @@ static int run_driver(StringRef ExecName,
     return sil_llvm_gen_main(argv, (void *)(intptr_t)getExecutablePath);
   case Driver::DriverKind::SILPassPipelineDumper:
     return sil_passpipeline_dumper_main(argv, (void *)(intptr_t)getExecutablePath);
+  case Driver::DriverKind::SwiftDependencyTool:
+    return swift_dependency_tool_main(argv, (void *)(intptr_t)getExecutablePath);
   case Driver::DriverKind::AutolinkExtract:
     return autolink_extract_main(
       TheDriver.getArgsWithoutProgramNameAndDriverMode(argv),

…ependency-tool/swift-dependency-tool.cpp …riverTool/swift_dependency_tool_main.cpptools/swift-dependency-tool/swift-dependency-tool.cpp renamed to lib/DriverTool/swift_dependency_tool_main.cpp tools/swift-dependency-tool/swift-dependency-tool.cpp renamed to lib/DriverTool/swift_dependency_tool_main.cpp

@@ -175,58 +175,53 @@ enum class ActionType : unsigned {
   YAMLToBinary
 };
 
-namespace options {
-
-static llvm::cl::OptionCategory Category("swift-dependency-tool Options");
+int swift_dependency_tool_main(ArrayRef<const char *> argv, void *MainAddr) {
+  INITIALIZE_LLVM();
 
-static llvm::cl::opt<std::string>
-InputFilename("input-filename",
-              llvm::cl::desc("Name of the input file"),
-              llvm::cl::cat(Category));
+  llvm::cl::OptionCategory Category("swift-dependency-tool Options");
 
-static llvm::cl::opt<std::string>
-OutputFilename("output-filename",
-               llvm::cl::desc("Name of the output file"),
-               llvm::cl::cat(Category));
+  llvm::cl::opt<std::string>
+  InputFilename("input-filename",
+                llvm::cl::desc("Name of the input file"),
+                llvm::cl::cat(Category));
 
-static llvm::cl::opt<ActionType>
-Action(llvm::cl::desc("Mode:"), llvm::cl::init(ActionType::None),
-       llvm::cl::cat(Category),
-       llvm::cl::values(
-           clEnumValN(ActionType::BinaryToYAML,
-                      "to-yaml", "Convert new binary .swiftdeps format to YAML"),
-           clEnumValN(ActionType::YAMLToBinary,
-                      "from-yaml", "Convert YAML to new binary .swiftdeps format")));
+  llvm::cl::opt<std::string>
+  OutputFilename("output-filename",
+                 llvm::cl::desc("Name of the output file"),
+                 llvm::cl::cat(Category));
 
-}
-
-int main(int argc, char *argv[]) {
-  PROGRAM_START(argc, argv);
-  INITIALIZE_LLVM();
+  llvm::cl::opt<ActionType>
+  Action(llvm::cl::desc("Mode:"), llvm::cl::init(ActionType::None),
+         llvm::cl::cat(Category),
+         llvm::cl::values(
+             clEnumValN(ActionType::BinaryToYAML,
+                        "to-yaml", "Convert new binary .swiftdeps format to YAML"),
+             clEnumValN(ActionType::YAMLToBinary,
+                        "from-yaml", "Convert YAML to new binary .swiftdeps format")));
 
-  llvm::cl::HideUnrelatedOptions(options::Category);
-  llvm::cl::ParseCommandLineOptions(argc, argv, "Swift Dependency Tool\n");
+  llvm::cl::HideUnrelatedOptions(Category);
+  llvm::cl::ParseCommandLineOptions(argv.size(), argv.data(), "Swift Dependency Tool\n");
 
   SourceManager sourceMgr;
   DiagnosticEngine diags(sourceMgr);
   llvm::vfs::OnDiskOutputBackend outputBackend;
 
-  switch (options::Action) {
+  switch (Action) {
   case ActionType::None: {
     llvm::errs() << "action required\n";
     llvm::cl::PrintHelpMessage();
     return 1;
   }
 
   case ActionType::BinaryToYAML: {
-    auto fg = SourceFileDepGraph::loadFromPath(options::InputFilename, true);
+    auto fg = SourceFileDepGraph::loadFromPath(InputFilename, true);
     if (!fg) {
       llvm::errs() << "Failed to read dependency file\n";
       return 1;
     }
 
     bool hadError =
-      withOutputPath(diags, outputBackend, options::OutputFilename,
+      withOutputPath(diags, outputBackend, OutputFilename,
         [&](llvm::raw_pwrite_stream &out) {
           out << "# Fine-grained v0\n";
           llvm::yaml::Output yamlWriter(out);
@@ -241,7 +236,7 @@ int main(int argc, char *argv[]) {
   }
 
   case ActionType::YAMLToBinary: {
-    auto bufferOrError = llvm::MemoryBuffer::getFile(options::InputFilename);
+    auto bufferOrError = llvm::MemoryBuffer::getFile(InputFilename);
     if (!bufferOrError) {
       llvm::errs() << "Failed to read dependency file\n";
       return 1;
@@ -258,7 +253,7 @@ int main(int argc, char *argv[]) {
     }
 
     if (writeFineGrainedDependencyGraphToPath(
-            diags, outputBackend, options::OutputFilename, fg)) {
+            diags, outputBackend, OutputFilename, fg)) {
       llvm::errs() << "Failed to write binary swiftdeps\n";
       return 1;
     }

test/CMakeLists.txt

@@ -55,7 +55,6 @@ function(get_test_dependencies SDK result_var_name)
       swift-frontend
       swift-demangle
       swift-demangle-yamldump
-      swift-dependency-tool
       swift-ide-test
       swift-llvm-opt
       swift-refactor

tools/CMakeLists.txt

@@ -18,7 +18,6 @@ endif()
 
 add_swift_tool_subdirectory(driver)
 add_swift_tool_subdirectory(swift-compatibility-symbols)
-add_swift_tool_subdirectory(swift-dependency-tool)
 add_swift_tool_subdirectory(swift-demangle)
 add_swift_tool_subdirectory(swift-demangle-yamldump)
 add_swift_tool_subdirectory(swift-def-to-strings-converter)

tools/driver/CMakeLists.txt

@@ -114,6 +114,11 @@ swift_create_post_build_symlink(swift-frontend
   DESTINATION "sil-passpipeline-dumper${CMAKE_EXECUTABLE_SUFFIX}"
   WORKING_DIRECTORY "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
 
+swift_create_post_build_symlink(swift-frontend
+  SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}"
+  DESTINATION "swift-dependency-tool${CMAKE_EXECUTABLE_SUFFIX}"
+  WORKING_DIRECTORY "${SWIFT_RUNTIME_OUTPUT_INTDIR}")
+
 swift_create_post_build_symlink(swift-frontend
   SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}"
   DESTINATION "swift-indent${CMAKE_EXECUTABLE_SUFFIX}"