[libclang][deps] Create dep scanner service options type

In preparation for adding additional service options, extract an opaque
CXDependencyScannerServiceOptions type with a setter for the dependency
scanning format.

(cherry picked from commit 61c6781)

Author: benlangmuir

clang/include/clang-c/Dependencies.h

@@ -174,12 +174,46 @@ typedef enum {
   CXDependencyMode_Full,
 } CXDependencyMode;
 
+/**
+ * Options used to construct a \c CXDependencyScannerService.
+ */
+typedef struct CXOpaqueDependencyScannerServiceOptions
+    *CXDependencyScannerServiceOptions;
+
+/**
+ * Creates a default set of service options.
+ * Must be disposed with \c
+ * clang_experimental_DependencyScannerServiceOptions_dispose.
+ */
+CINDEX_LINKAGE CXDependencyScannerServiceOptions
+clang_experimental_DependencyScannerServiceOptions_create();
+
+/**
+ * Dispose of a \c CXDependencyScannerServiceOptions object.
+ */
+CINDEX_LINKAGE void clang_experimental_DependencyScannerServiceOptions_dispose(
+    CXDependencyScannerServiceOptions);
+
+/**
+ * Specify a \c CXDependencyMode in the given options.
+ */
+CINDEX_LINKAGE void
+clang_experimental_DependencyScannerServiceOptions_setDependencyMode(
+    CXDependencyScannerServiceOptions Opts, CXDependencyMode Mode);
+
+/**
+ * See \c clang_experimental_DependencyScannerService_create_v1.
+ */
+CINDEX_LINKAGE CXDependencyScannerService
+clang_experimental_DependencyScannerService_create_v0(CXDependencyMode Format);
+
 /**
  * Create a \c CXDependencyScannerService object.
  * Must be disposed with \c clang_DependencyScannerService_dispose().
  */
 CINDEX_LINKAGE CXDependencyScannerService
-clang_experimental_DependencyScannerService_create_v0(CXDependencyMode Format);
+clang_experimental_DependencyScannerService_create_v1(
+    CXDependencyScannerServiceOptions Opts);
 
 /**
  * Dispose of a \c CXDependencyScannerService object.

clang/tools/c-index-test/core_main.cpp

@@ -678,9 +678,16 @@ static int scanDeps(ArrayRef<const char *> Args, std::string WorkingDirectory,
                     bool SerializeDiags, bool DependencyFile,
                     ArrayRef<std::string> DepTargets, std::string OutputPath,
                     Optional<std::string> ModuleName = None) {
+  CXDependencyScannerServiceOptions Opts =
+      clang_experimental_DependencyScannerServiceOptions_create();
+  auto CleanupOpts = llvm::make_scope_exit([&] {
+    clang_experimental_DependencyScannerServiceOptions_dispose(Opts);
+  });
+  clang_experimental_DependencyScannerServiceOptions_setDependencyMode(
+      Opts, CXDependencyMode_Full);
+
   CXDependencyScannerService Service =
-      clang_experimental_DependencyScannerService_create_v0(
-          CXDependencyMode_Full);
+      clang_experimental_DependencyScannerService_create_v1(Opts);
   CXDependencyScannerWorker Worker =
       clang_experimental_DependencyScannerWorker_create_v0(Service);
   auto DisposeWorkerAndService = llvm::make_scope_exit([&]() {

clang/tools/libclang/CDependencies.cpp

@@ -25,6 +25,18 @@
 using namespace clang;
 using namespace clang::tooling::dependencies;
 
+namespace {
+struct DependencyScannerServiceOptions {
+  ScanningOutputFormat Format = ScanningOutputFormat::Full;
+  CASOptions CASOpts;
+  std::shared_ptr<cas::ObjectStore> CAS;
+  std::shared_ptr<cas::ActionCache> Cache;
+};
+} // end anonymous namespace
+
+DEFINE_SIMPLE_CONVERSION_FUNCTIONS(DependencyScannerServiceOptions,
+                                   CXDependencyScannerServiceOptions)
+
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(DependencyScanningService,
                                    CXDependencyScannerService)
 DEFINE_SIMPLE_CONVERSION_FUNCTIONS(DependencyScanningWorker,
@@ -67,6 +79,21 @@ void clang_experimental_ModuleDependencySet_dispose(
   delete MDS;
 }
 
+CXDependencyScannerServiceOptions
+clang_experimental_DependencyScannerServiceOptions_create() {
+  return wrap(new DependencyScannerServiceOptions);
+}
+
+void clang_experimental_DependencyScannerServiceOptions_dispose(
+    CXDependencyScannerServiceOptions Opts) {
+  delete unwrap(Opts);
+}
+
+void clang_experimental_DependencyScannerServiceOptions_setDependencyMode(
+    CXDependencyScannerServiceOptions Opts, CXDependencyMode Mode) {
+  unwrap(Opts)->Format = unwrap(Mode);
+}
+
 CXDependencyScannerService
 clang_experimental_DependencyScannerService_create_v0(CXDependencyMode Format) {
   // FIXME: Pass default CASOpts and nullptr as CachingOnDiskFileSystem now.
@@ -78,6 +105,18 @@ clang_experimental_DependencyScannerService_create_v0(CXDependencyMode Format) {
       /*ReuseFilemanager=*/false));
 }
 
+CXDependencyScannerService
+clang_experimental_DependencyScannerService_create_v1(
+    CXDependencyScannerServiceOptions Opts) {
+  // FIXME: Pass default CASOpts and nullptr as CachingOnDiskFileSystem now.
+  CASOptions CASOpts;
+  IntrusiveRefCntPtr<llvm::cas::CachingOnDiskFileSystem> FS;
+  return wrap(new DependencyScanningService(
+      ScanningMode::DependencyDirectivesScan, unwrap(Opts)->Format,
+      CASOpts, /*ActionCache=*/nullptr, std::move(FS),
+      /*ReuseFilemanager=*/false));
+}
+
 void clang_experimental_DependencyScannerService_dispose_v0(
     CXDependencyScannerService Service) {
   delete unwrap(Service);

clang/tools/libclang/libclang.map

@@ -472,6 +472,10 @@ LLVM_13 {
 
 LLVM_16 {
   global:
+    clang_experimental_DependencyScannerService_create_v1;
+    clang_experimental_DependencyScannerServiceOptions_create;
+    clang_experimental_DependencyScannerServiceOptions_dispose;
+    clang_experimental_DependencyScannerServiceOptions_setDependencyMode;
     clang_experimental_DependencyScannerWorker_getFileDependencies_v5;
 };