[Dependency Scanning] Use size_t for array sizes and re-arrange array struct type fields to be consistent.

Author: artemcm

include/swift-c/DependencyScan/DependencyScan.h

@@ -41,12 +41,12 @@ SWIFTSCAN_BEGIN_DECLS
  */
 typedef struct {
   const void *data;
-  unsigned length;
+  size_t length;
 } swiftscan_string_ref_t;
 
 typedef struct {
   swiftscan_string_ref_t *strings;
-  unsigned count;
+  size_t count;
 } swiftscan_string_set_t;
 
 typedef enum {
@@ -70,8 +70,8 @@ typedef struct swiftscan_import_set_s *swiftscan_import_set_t;
 
 /// Full Dependency Graph (Result)
 typedef struct {
-  int count;
   swiftscan_dependency_info_t *modules;
+  size_t count;
 } swiftscan_dependency_set_t;
 
 //=== Batch Scan Input Specification --------------------------------------===//
@@ -80,13 +80,13 @@ typedef struct {
 typedef struct swiftscan_batch_scan_entry_s *swiftscan_batch_scan_entry_t;
 
 typedef struct {
-  int count;
   swiftscan_batch_scan_entry_t *modules;
+  size_t count;
 } swiftscan_batch_scan_input_t;
 
 typedef struct {
-  int count;
   swiftscan_dependency_graph_t *results;
+  size_t count;
 } swiftscan_batch_scan_result_t;
 
 //=== Scanner Invocation Specification ------------------------------------===//

lib/DependencyScan/ScanDependencies.cpp

@@ -495,7 +495,7 @@ static void writeJSON(llvm::raw_ostream &out,
   out << "  \"modules\": [\n";
   SWIFT_DEFER { out << "  ]\n"; };
   const auto module_set = fullDependencies->dependencies;
-  for (int mi = 0; mi < module_set->count; ++mi) {
+  for (size_t mi = 0; mi < module_set->count; ++mi) {
     const auto &moduleInfo = *module_set->modules[mi];
     auto &directDependencies = moduleInfo.direct_dependencies;
     // The module we are describing.
@@ -1186,18 +1186,15 @@ llvm::ErrorOr<swiftscan_dependency_graph_t>
 swift::dependencies::performModuleScan(CompilerInstance &instance,
                                        ModuleDependenciesCache &cache) {
   ModuleDecl *mainModule = instance.getMainModule();
-
   // First, identify the dependencies of the main module
   auto mainDependencies = identifyMainModuleDependencies(instance);
-
   // Add the main module.
   StringRef mainModuleName = mainModule->getNameStr();
   llvm::SetVector<ModuleDependencyID, std::vector<ModuleDependencyID>,
                   std::set<ModuleDependencyID>>
       allModules;
 
   allModules.insert({mainModuleName.str(), mainDependencies.getKind()});
-
   cache.recordDependencies(mainModuleName, std::move(mainDependencies));
   auto &ctx = instance.getASTContext();
   auto ModuleCachePath = getModuleCachePathFromClang(

tools/libSwiftScan/libSwiftScan.cpp

@@ -100,7 +100,7 @@ void swiftscan_dependency_info_dispose(swiftscan_dependency_info_t info) {
 }
 
 void swiftscan_dependency_set_dispose(swiftscan_dependency_set_t *set) {
-  for (int i = 0; i < set->count; ++i) {
+  for (size_t i = 0; i < set->count; ++i) {
     swiftscan_dependency_info_dispose(set->modules[i]);
   }
   delete[] set->modules;
@@ -145,7 +145,7 @@ swiftscan_batch_scan_result_create(swiftscan_scanner_t scanner,
     Compilation.push_back(swiftscan_get_C_string(invocation->argv->strings[i]));
 
   std::vector<BatchScanInput> BatchInput;
-  for (int i = 0; i < batch_input->count; ++i) {
+  for (size_t i = 0; i < batch_input->count; ++i) {
     swiftscan_batch_scan_entry_s *Entry = batch_input->modules[i];
     BatchInput.push_back({swiftscan_get_C_string(Entry->module_name),
                           swiftscan_get_C_string(Entry->arguments),
@@ -441,7 +441,7 @@ void swiftscan_batch_scan_entry_dispose(swiftscan_batch_scan_entry_t entry) {
 }
 
 void swiftscan_batch_scan_input_dispose(swiftscan_batch_scan_input_t *input) {
-  for (int i = 0; i < input->count; ++i) {
+  for (size_t i = 0; i < input->count; ++i) {
     swiftscan_batch_scan_entry_dispose(input->modules[i]);
   }
   delete[] input->modules;
@@ -450,7 +450,7 @@ void swiftscan_batch_scan_input_dispose(swiftscan_batch_scan_input_t *input) {
 
 void swiftscan_batch_scan_result_dispose(
     swiftscan_batch_scan_result_t *result) {
-  for (int i = 0; i < result->count; ++i) {
+  for (size_t i = 0; i < result->count; ++i) {
     swiftscan_dependency_graph_dispose(result->results[i]);
   }
   delete[] result->results;