Renaming clang-scan-deps' module-name option to module-names.

Author: qiongsiwu

clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp

@@ -751,10 +751,19 @@ bool DependencyScanningWorker::computeDependencies(
   InMemoryFS->setCurrentWorkingDirectory(WorkingDirectory);
   SmallString<128> FakeInputPath;
   // TODO: We should retry the creation if the path already exists.
-  // FIXME: should we create files for multiple modules? I think so?
+  // FIXME: Using ModuleNames[0] should be sufficient to create a unique
+  // input file name. The diagnostic information is specifc enough about
+  // in which exact module an error occurs. That said any error reporting
+  // that relies on the path below could be confusing.We may want to
+  // find better ways (e.g. by concatenating the module names) to make
+  // the temporary file name more precise.
   llvm::sys::fs::createUniquePath(ModuleNames[0] + "-%%%%%%%%.input",
                                   FakeInputPath,
                                   /*MakeAbsolute=*/false);
+
+  // The fake file must contain at least ModuleNames.size() characters,
+  // since we are simulating lexing it, and we are assuming each module name
+  // takes the space of one character.
   std::string FakeString(ModuleNames.size(), ' ');
   InMemoryFS->addFile(FakeInputPath, 0,
                       llvm::MemoryBuffer::getMemBuffer(FakeString));

clang/test/ClangScanDeps/link-libraries.c

@@ -32,7 +32,7 @@ module transitive {
 }]
 
 // RUN: sed "s|DIR|%/t|g" %t/cdb.json.template > %t/cdb.json
-// RUN: clang-scan-deps -compilation-database %t/cdb.json -format experimental-full -module-name=root > %t/result.json
+// RUN: clang-scan-deps -compilation-database %t/cdb.json -format experimental-full -module-names=root > %t/result.json
 // RUN: cat %t/result.json | sed 's:\\\\\?:/:g' | FileCheck -DPREFIX=%/t %s
 
 // CHECK:      {

clang/test/ClangScanDeps/modules-full-by-mod-name.c

@@ -25,7 +25,7 @@ module transitive { header "transitive.h" }
 }]
 
 // RUN: sed "s|DIR|%/t|g" %t/cdb.json.template > %t/cdb.json
-// RUN: clang-scan-deps -compilation-database %t/cdb.json -format experimental-full -module-name=root > %t/result.json
+// RUN: clang-scan-deps -compilation-database %t/cdb.json -format experimental-full -module-names=root > %t/result.json
 // RUN: cat %t/result.json | sed 's:\\\\\?:/:g' | FileCheck -DPREFIX=%/t %s
 
 // CHECK:      {

clang/tools/clang-scan-deps/ClangScanDeps.cpp

@@ -203,7 +203,7 @@ static void ParseArgs(int argc, char **argv) {
   if (const llvm::opt::Arg *A = Args.getLastArg(OPT_compilation_database_EQ))
     CompilationDB = A->getValue();
 
-  if (const llvm::opt::Arg *A = Args.getLastArg(OPT_module_name_EQ))
+  if (const llvm::opt::Arg *A = Args.getLastArg(OPT_module_names_EQ))
     ModuleName = A->getValue();
 
   for (const llvm::opt::Arg *A : Args.filtered(OPT_dependency_target_EQ))
@@ -1024,11 +1024,17 @@ int clang_scan_deps_main(int argc, char **argv, const llvm::ToolContext &) {
             HadErrors = true;
         }
       } else if (ModuleName) {
+        StringRef NamesRef(*ModuleName);
+        SmallVector<StringRef, 16> NameList;
+        NamesRef.split(NameList, ",");
         auto MaybeModuleDepsGraph = WorkerTool.getModuleDependencies(
-            ArrayRef<StringRef>({*ModuleName}), Input->CommandLine, CWD,
+            NameList, Input->CommandLine, CWD,
             AlreadySeenModules, LookupOutput);
-        if (handleModuleResult(*ModuleName, MaybeModuleDepsGraph, *FD,
-                               LocalIndex, DependencyOS, Errs))
+        // FIXME: Need to have better error handling logic for a list
+        // of modules. Probably through some call back.
+        if (handleModuleResult(/* *ModuleName*/ NameList[0],
+                               MaybeModuleDepsGraph, *FD, LocalIndex,
+                               DependencyOS, Errs))
           HadErrors = true;
       } else {
         std::unique_ptr<llvm::MemoryBuffer> TU;

clang/tools/clang-scan-deps/Opts.td

@@ -26,7 +26,7 @@ def eager_load_pcm : F<"eager-load-pcm", "Load PCM files eagerly (instead of laz
 def j : Arg<"j", "Number of worker threads to use (default: use all concurrent threads)">;
 
 defm compilation_database : Eq<"compilation-database", "Compilation database">;
-defm module_name : Eq<"module-name", "the module of which the dependencies are to be computed">;
+defm module_names : Eq<"module-names", "the module of which the dependencies are to be computed">;
 defm dependency_target : Eq<"dependency-target", "The names of dependency targets for the dependency file">;
 
 defm tu_buffer_path: Eq<"tu-buffer-path", "The path to the translation unit for depscan. Not compatible with -module-name">;