[Dependency Scanning] Factor the shared library libSwiftScan into tools and add exports file.

This library now relires on a static compiler library called `swiftDependencyScan`, which is also common to being used by `swift-frontend` for its dependency scanner invocations.

Author: artemcm

include/swift-c/DependencyScan/DependencyScan.h

@@ -160,7 +160,7 @@ swiftscan_swift_binary_detail_get_module_doc_path(
 
 SWIFTSCAN_PUBLIC swiftscan_string_t
 swiftscan_swift_binary_detail_get_module_source_info_path(
-    swiftscan_module_details_t *details);
+    swiftscan_module_details_t details);
 
 //=== Swift Placeholder Module Details query APIs -------------------------===//
 

include/swift/DependencyScan/DependencyScanImpl.h

@@ -17,7 +17,12 @@
 #define SWIFT_C_DEPENDENCY_SCAN_IMPL_H
 
 #include "swift-c/DependencyScan/DependencyScan.h"
-#include "swift/DependencyScan/DependencyScanningTool.h"
+
+namespace swift {
+namespace dependencies {
+class DependencyScanningTool;
+}
+}
 
 struct swiftscan_dependency_result_s {
   /// The name of the main module for this dependency graph (root node)

lib/DependencyScan/CMakeLists.txt

@@ -1,20 +1,13 @@
-set_swift_llvm_is_available()
-add_swift_host_library(SwiftScan STATIC
-  DependencyScanImpl.cpp
+#set_swift_llvm_is_available()
+
+add_swift_host_library(swiftDependencyScan STATIC
   DependencyScanningTool.cpp
   ScanDependencies.cpp
-  DSStringImpl.cpp
-  c-include-check.c)
-
-add_dependencies(SwiftScan
-  swift-syntax-generated-headers
-  SwiftOptions)
+  DSString.cpp)
 
-target_link_libraries(SwiftScan INTERFACE
-  clangAPINotes
+target_link_libraries(swiftDependencyScan INTERFACE
   clangBasic)
 
-target_link_libraries(SwiftScan PRIVATE
+target_link_libraries(swiftDependencyScan PRIVATE
     swiftClangImporter
-    swiftDemangling
     swiftFrontend)

lib/DependencyScan/DSStringImpl.cpp renamed to lib/DependencyScan/DSString.cpp

@@ -7,16 +7,14 @@ add_swift_host_library(swiftFrontendTool STATIC
   TBD.cpp)
 add_dependencies(swiftFrontendTool
   swift-syntax-generated-headers
-  SwiftScan
   SwiftOptions)
 target_link_libraries(swiftFrontendTool INTERFACE
   clangAPINotes
-  SwiftScan
   clangBasic)
 target_link_libraries(swiftFrontendTool PRIVATE
     swiftClangImporter
     swiftDemangling
-    SwiftScan
+    swiftDependencyScan
     swiftFrontend
     swiftIDE
     swiftImmediate

lib/FrontendTool/CMakeLists.txt

@@ -28,6 +28,7 @@ add_swift_tool_subdirectory(swift-llvm-opt)
 add_swift_tool_subdirectory(swift-api-digester)
 add_swift_tool_subdirectory(swift-ast-script)
 add_swift_tool_subdirectory(swift-refactor)
+add_swift_tool_subdirectory(libSwiftScan)
 if(SWIFT_BUILD_SYNTAXPARSERLIB)
   add_swift_tool_subdirectory(libSwiftSyntaxParser)
   if(SWIFT_INCLUDE_TESTS)

tools/CMakeLists.txt

@@ -0,0 +1,28 @@
+include(SwiftWindowsSupport)
+swift_swap_compiler_if_needed("libSwiftScan")
+
+# Use an 'internal' name, this is primarily intended for SwiftDriver to import.
+set(SWIFT_SCAN_LIB_NAME "_InternalSwiftScan")
+
+set(LLVM_EXPORTED_SYMBOL_FILE
+    ${CMAKE_CURRENT_SOURCE_DIR}/libSwiftScan.exports)
+
+add_swift_host_library(libSwiftScan SHARED
+  libSwiftScan.cpp
+  c-include-check.c)
+
+add_dependencies(libSwiftScan
+  clang
+  swiftDependencyScan)
+
+target_link_libraries(libSwiftScan PRIVATE
+    swiftDependencyScan)
+
+set_target_properties(libSwiftScan
+    PROPERTIES
+    OUTPUT_NAME ${SWIFT_SCAN_LIB_NAME})
+
+add_llvm_symbol_exports(libSwiftScan ${LLVM_EXPORTED_SYMBOL_FILE})
+
+# Adds -dead_strip option
+add_link_opts(libSwiftScan)

tools/libSwiftScan/CMakeLists.txt

@@ -15,6 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "swift/DependencyScan/DependencyScanImpl.h"
+#include "swift/DependencyScan/DependencyScanningTool.h"
 
 using namespace swift::dependencies;
 
@@ -29,7 +30,7 @@ void swiftscan_scanner_dispose(swiftscan_scanner_t c_scanner) {
 }
 
 swiftscan_dependency_result_t
-swiftscan_scan_dependencies(swiftscan_scanner_t *scanner,
+swiftscan_scan_dependencies(swiftscan_scanner_t scanner,
                             swiftscan_scan_invocation_t invocation) {
   DependencyScanningTool *ScanningTool = unwrap_scanner(scanner);
   int argc = invocation->argv->count;
@@ -46,7 +47,7 @@ swiftscan_scan_dependencies(swiftscan_scanner_t *scanner,
 }
 
 swiftscan_batch_scan_result_t *
-swiftscan_batch_scan_dependencies(swiftscan_scanner_t *scanner,
+swiftscan_batch_scan_dependencies(swiftscan_scanner_t scanner,
                                   swiftscan_batch_scan_input_t *batch_input,
                                   swiftscan_scan_invocation_t invocation) {
   DependencyScanningTool *ScanningTool = unwrap_scanner(scanner);
@@ -81,7 +82,7 @@ swiftscan_batch_scan_dependencies(swiftscan_scanner_t *scanner,
 }
 
 swiftscan_prescan_result_t
-swiftscan_prescan_dependencies(swiftscan_scanner_t *scanner,
+swiftscan_prescan_dependencies(swiftscan_scanner_t scanner,
                                swiftscan_scan_invocation_t invocation) {
   DependencyScanningTool *ScanningTool = unwrap_scanner(scanner);
   int argc = invocation->argv->count;
@@ -97,6 +98,18 @@ swiftscan_prescan_dependencies(swiftscan_scanner_t *scanner,
   return ImportSet;
 }
 
+//=== Dependency Result Functions -----------------------------------------===//
+
+swiftscan_string_t swiftscan_dependency_result_get_main_module_name(
+    swiftscan_dependency_result_t result) {
+  return result->main_module_name;
+}
+
+swiftscan_dependency_set_t *swiftscan_dependency_result_get_module_set(
+    swiftscan_dependency_result_t result) {
+  return result->module_set;
+}
+
 //=== Module Dependency Info query APIs -----------------------------------===//
 
 swiftscan_string_t

lib/DependencyScan/c-include-check.c renamed to tools/libSwiftScan/c-include-check.c

@@ -0,0 +1,53 @@
+swiftscan_dependency_result_get_main_module_name
+swiftscan_dependency_result_get_module_set
+swiftscan_module_info_get_module_name
+swiftscan_module_info_get_module_path
+swiftscan_module_info_get_source_files
+swiftscan_module_info_get_direct_dependencies
+swiftscan_module_info_get_details
+swiftscan_module_detail_get_kind
+swiftscan_swift_textual_detail_get_module_interface_path
+swiftscan_swift_textual_detail_get_compiled_module_candidates
+swiftscan_swift_textual_detail_get_bridging_header_path
+swiftscan_swift_textual_detail_get_bridging_source_files
+swiftscan_swift_textual_detail_get_bridging_module_dependencies
+swiftscan_swift_textual_detail_get_command_line
+swiftscan_swift_textual_detail_get_extra_pcm_args
+swiftscan_swift_textual_detail_get_context_hash
+swiftscan_swift_textual_detail_get_is_framework
+swiftscan_swift_binary_detail_get_compiled_module_path
+swiftscan_swift_binary_detail_get_module_doc_path
+swiftscan_swift_binary_detail_get_module_source_info_path
+swiftscan_swift_placeholder_detail_get_compiled_module_path
+swiftscan_swift_placeholder_detail_get_module_doc_path
+swiftscan_swift_placeholder_detail_get_module_source_info_path
+swiftscan_clang_detail_get_module_map_path
+swiftscan_clang_detail_get_context_hash
+swiftscan_clang_detail_get_command_line
+swiftscan_batch_scan_entry_get_module_name
+swiftscan_batch_scan_entry_get_arguments
+swiftscan_batch_scan_entry_get_is_swift
+swiftscan_prescan_result_get_import_set
+swiftscan_scan_invocation_create
+swiftscan_scan_invocation_set_working_directory
+swiftscan_scan_invocation_set_argv
+swiftscan_scan_invocation_get_working_directory
+swiftscan_scan_invocation_get_argc
+swiftscan_scan_invocation_get_argv
+swiftscan_dependency_info_details_dispose
+swiftscan_dependency_info_dispose
+swiftscan_dependency_set_dispose
+swiftscan_dependency_result_dispose
+swiftscan_prescan_result_dispose
+swiftscan_batch_scan_entry_dispose
+swiftscan_batch_scan_input_dispose
+swiftscan_batch_scan_result_dispose
+swiftscan_scan_invocation_dispose
+swiftscan_scanner_create
+swiftscan_scanner_dispose
+swiftscan_scan_dependencies
+swiftscan_batch_scan_dependencies
+swiftscan_prescan_dependencies
+swiftscan_get_C_string
+swiftscan_string_dispose
+swiftscan_string_set_dispose