[Dependency Scanning] Make scanner invocation context (argc, argv, working_dir) an opaque type

Author: artemcm

include/swift-c/DependencyScan/DependencyScan.h

@@ -74,6 +74,12 @@ typedef struct {
   swiftscan_dependency_result_t *results;
 } swiftscan_batch_scan_result_t;
 
+//=== Scanner Invocation Specification ------------------------------------===//
+
+/// Opaque container of all relevant context required to launch a dependency
+/// scan (command line arguments, working directory, etc.)
+typedef void *swiftscan_scan_invocation_t;
+
 //=== Dependency Result Functions -----------------------------------------===//
 
 SWIFTSCAN_PUBLIC swiftscan_string_t
@@ -197,6 +203,18 @@ swiftscan_batch_scan_entry_get_is_swift(swiftscan_batch_scan_entry_t entry);
 SWIFTSCAN_PUBLIC swiftscan_string_set_t *
 swiftscan_prescan_result_get_import_set(swiftscan_prescan_result_t result);
 
+//=== Scanner Invocation Functions ----------------------------------------===//
+
+SWIFTSCAN_PUBLIC swiftscan_string_t
+swiftscan_scan_invocation_get_working_directory(
+    swiftscan_scan_invocation_t invocation);
+
+SWIFTSCAN_PUBLIC int
+swiftscan_scan_invocation_get_argc(swiftscan_scan_invocation_t invocation);
+
+SWIFTSCAN_PUBLIC swiftscan_string_set_t *
+swiftscan_scan_invocation_get_argv(swiftscan_scan_invocation_t invocation);
+
 //=== Cleanup Functions ---------------------------------------------------===//
 
 SWIFTSCAN_PUBLIC void
@@ -223,6 +241,9 @@ swiftscan_batch_scan_input_dispose(swiftscan_batch_scan_input_t *input);
 SWIFTSCAN_PUBLIC void
 swiftscan_batch_scan_result_dispose(swiftscan_batch_scan_result_t *result);
 
+SWIFTSCAN_PUBLIC void
+swiftscan_scan_invocation_dispose(swiftscan_scan_invocation_t invocation);
+
 //=== Scanner Functions ---------------------------------------------------===//
 
 /// Container of the configuration state and shared cache for dependency
@@ -233,21 +254,16 @@ SWIFTSCAN_PUBLIC swiftscan_scanner_t swiftscan_scanner_create(void);
 
 SWIFTSCAN_PUBLIC void swiftscan_scanner_dispose(swiftscan_scanner_t);
 
-SWIFTSCAN_PUBLIC swiftscan_dependency_result_t
-swiftscan_scan_dependencies(swiftscan_scanner_t *scanner,
-                            const char *working_directory, int argc,
-                            const char *const *argv);
+SWIFTSCAN_PUBLIC swiftscan_dependency_result_t swiftscan_scan_dependencies(
+    swiftscan_scanner_t scanner, swiftscan_scan_invocation_t invocation);
 
 SWIFTSCAN_PUBLIC swiftscan_batch_scan_result_t *
-swiftscan_batch_scan_dependencies(swiftscan_scanner_t *scanner,
-                                  const char *working_directory,
+swiftscan_batch_scan_dependencies(swiftscan_scanner_t scanner,
                                   swiftscan_batch_scan_input_t *batch_input,
-                                  int argc, const char *const *argv);
+                                  swiftscan_scan_invocation_t invocation);
 
-SWIFTSCAN_PUBLIC swiftscan_prescan_result_t
-swiftscan_prescan_dependencies(swiftscan_scanner_t *scanner,
-                               const char *working_directory, int argc,
-                               const char *const *argv);
+SWIFTSCAN_PUBLIC swiftscan_prescan_result_t swiftscan_prescan_dependencies(
+    swiftscan_scanner_t scanner, swiftscan_scan_invocation_t invocation);
 
 SWIFTSCAN_END_DECLS
 

include/swift/DependencyScan/DependencyScanImpl.h

@@ -146,6 +146,11 @@ typedef struct {
   swiftscan_string_set_t *import_set;
 } swiftscan_impl_prescan_result_t;
 
+typedef struct {
+  swiftscan_string_t working_directory;
+  swiftscan_string_set_t *argv;
+} swiftscan_impl_scan_invocation_t;
+
 inline swift::dependencies::DependencyScanningTool *
 unwrap_scanner(swiftscan_scanner_t P) {
   return reinterpret_cast<swift::dependencies::DependencyScanningTool *>(P);
@@ -212,4 +217,15 @@ wrap_batch_entry(const swiftscan_impl_batch_scan_entry_t *P) {
       const_cast<swiftscan_impl_batch_scan_entry_t *>(P));
 }
 
+inline swiftscan_impl_scan_invocation_t *
+unwrap_scan_invocation(swiftscan_scan_invocation_t P) {
+  return reinterpret_cast<swiftscan_impl_scan_invocation_t *>(P);
+}
+
+inline swiftscan_batch_scan_entry_t
+wrap_scan_invocation(const swiftscan_impl_scan_invocation_t *P) {
+  return reinterpret_cast<swiftscan_scan_invocation_t>(
+      const_cast<swiftscan_impl_scan_invocation_t *>(P));
+}
+
 #endif // SWIFT_C_DEPENDENCY_SCAN_IMPL_H

lib/DependencyScan/DependencyScanImpl.cpp

@@ -30,12 +30,15 @@ void swiftscan_scanner_dispose(swiftscan_scanner_t c_scanner) {
 
 swiftscan_dependency_result_t
 swiftscan_scan_dependencies(swiftscan_scanner_t *scanner,
-                            const char *working_directory, int argc,
-                            const char *const *argv) {
+                            swiftscan_scan_invocation_t invocation) {
   DependencyScanningTool *ScanningTool = unwrap_scanner(scanner);
+  swiftscan_impl_scan_invocation_t *InvocationImpl =
+      unwrap_scan_invocation(invocation);
+  int argc = InvocationImpl->argv->count;
   std::vector<const char *> Compilation;
   for (int i = 0; i < argc; ++i)
-    Compilation.push_back(argv[i]);
+    Compilation.push_back(
+        swiftscan_get_C_string(InvocationImpl->argv->strings[i]));
 
   // Execute the scan and bridge the result
   auto ScanResult = ScanningTool->getDependencies(Compilation, {});
@@ -47,13 +50,16 @@ swiftscan_scan_dependencies(swiftscan_scanner_t *scanner,
 
 swiftscan_batch_scan_result_t *
 swiftscan_batch_scan_dependencies(swiftscan_scanner_t *scanner,
-                                  const char *working_directory,
                                   swiftscan_batch_scan_input_t *batch_input,
-                                  int argc, const char *const *argv) {
+                                  swiftscan_scan_invocation_t invocation) {
   DependencyScanningTool *ScanningTool = unwrap_scanner(scanner);
+  swiftscan_impl_scan_invocation_t *InvocationImpl =
+      unwrap_scan_invocation(invocation);
+  int argc = InvocationImpl->argv->count;
   std::vector<const char *> Compilation;
   for (int i = 0; i < argc; ++i)
-    Compilation.push_back(argv[i]);
+    Compilation.push_back(
+        swiftscan_get_C_string(InvocationImpl->argv->strings[i]));
 
   std::vector<BatchScanInput> BatchInput;
   for (int i = 0; i < batch_input->count; ++i) {
@@ -83,12 +89,15 @@ swiftscan_batch_scan_dependencies(swiftscan_scanner_t *scanner,
 
 swiftscan_prescan_result_t
 swiftscan_prescan_dependencies(swiftscan_scanner_t *scanner,
-                               const char *working_directory, int argc,
-                               const char *const *argv) {
+                               swiftscan_scan_invocation_t invocation) {
   DependencyScanningTool *ScanningTool = unwrap_scanner(scanner);
+  swiftscan_impl_scan_invocation_t *InvocationImpl =
+      unwrap_scan_invocation(invocation);
+  int argc = InvocationImpl->argv->count;
   std::vector<const char *> Compilation;
   for (int i = 0; i < argc; ++i)
-    Compilation.push_back(argv[i]);
+    Compilation.push_back(
+        swiftscan_get_C_string(InvocationImpl->argv->strings[i]));
 
   // Execute the scan and bridge the result
   auto PreScanResult = ScanningTool->getImports(Compilation);
@@ -261,6 +270,22 @@ swiftscan_prescan_result_get_import_set(swiftscan_prescan_result_t result) {
   return unwrap_prescan_result(result)->import_set;
 }
 
+//=== Scanner Invocation Functions ----------------------------------------===//
+
+swiftscan_string_t swiftscan_scan_invocation_get_working_directory(
+    swiftscan_scan_invocation_t invocation) {
+  return unwrap_scan_invocation(invocation)->working_directory;
+}
+
+int swiftscan_scan_invocation_get_argc(swiftscan_scan_invocation_t invocation) {
+  return unwrap_scan_invocation(invocation)->argv->count;
+}
+
+swiftscan_string_set_t *
+swiftscan_scan_invocation_get_argv(swiftscan_scan_invocation_t invocation) {
+  return unwrap_scan_invocation(invocation)->argv;
+}
+
 //=== Cleanup Functions ---------------------------------------------------===//
 
 void swiftscan_dependency_info_details_dispose(
@@ -363,3 +388,11 @@ void swiftscan_batch_scan_result_dispose(
   delete[] result->results;
   delete result;
 }
+
+void swiftscan_scan_invocation_dispose(swiftscan_scan_invocation_t invocation) {
+  swiftscan_impl_scan_invocation_t *invocation_impl =
+      unwrap_scan_invocation(invocation);
+  swiftscan_string_dispose(invocation_impl->working_directory);
+  swiftscan_string_set_dispose(invocation_impl->argv);
+  delete invocation_impl;
+}