Address review comments

Author: ahatanaka

clang/include/clang-c/Dependencies.h

@@ -228,7 +228,7 @@ clang_experimental_DependencyScannerWorker_getFileDependencies_v1(
  * but get the dependencies by module name alone.
  */
 CINDEX_LINKAGE CXFileDependencies *
-clang_experimental_DependencyScannerWorkerByModName_getFileDependencies_v0(
+clang_experimental_DependencyScannerWorker_getDependenciesByModName_v0(
     CXDependencyScannerWorker Worker, int argc, const char *const *argv,
     const char *ModuleName, const char *WorkingDirectory,
     CXModuleDiscoveredCallback *MDC, void *Context, CXString *error);

clang/include/clang/Frontend/FrontendActions.h

@@ -299,12 +299,13 @@ class PrintPreprocessedAction : public PreprocessorFrontendAction {
   bool hasPCHSupport() const override { return true; }
 };
 
-class GetDependiciesByModuleNameAction : public PreprocessOnlyAction {
+class GetDependenciesByModuleNameAction : public PreprocessOnlyAction {
   const char *ModuleName;
   void ExecuteAction() override;
 
 public:
-  GetDependiciesByModuleNameAction(const char *ModName) : ModuleName(ModName) {}
+  GetDependenciesByModuleNameAction(const char *ModName)
+      : ModuleName(ModName) {}
 };
 
 }  // end namespace clang

clang/lib/Frontend/FrontendActions.cpp

@@ -994,7 +994,7 @@ void PrintDependencyDirectivesSourceMinimizerAction::ExecuteAction() {
   llvm::outs() << Output;
 }
 
-void GetDependiciesByModuleNameAction::ExecuteAction() {
+void GetDependenciesByModuleNameAction::ExecuteAction() {
   CompilerInstance &CI = getCompilerInstance();
   Preprocessor &PP = CI.getPreprocessor();
   SourceManager &SM = PP.getSourceManager();

clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp

@@ -263,7 +263,7 @@ class DependencyScanningAction : public tooling::ToolAction {
     std::unique_ptr<FrontendAction> Action;
 
     if (ModuleName)
-      Action = std::make_unique<GetDependiciesByModuleNameAction>(ModuleName);
+      Action = std::make_unique<GetDependenciesByModuleNameAction>(ModuleName);
     else
       Action = std::make_unique<ReadPCHAndPreprocessAction>();
 
@@ -332,7 +332,8 @@ llvm::Error DependencyScanningWorker::computeDependencies(
     /// Create the tool that uses the underlying file system to ensure that any
     /// file system requests that are made by the driver do not go through the
     /// dependency scanning filesystem.
-    assert(!!ModuleName == Input.empty());
+    assert((ModuleName != nullptr) == Input.empty() &&
+           "either ModuleName or Input is not empty, but not both");
     SmallString<128> FullPath;
     tooling::ClangTool Tool(CDB, ModuleName ? ModuleName : Input,
                             PCHContainerOps, RealFS, Files);

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

@@ -13,17 +13,12 @@
 // RUN: echo %t.dir > %t.result
 // RUN: clang-scan-deps -compilation-database %t.cdb -j 4 -format experimental-full \
 // RUN:   -mode preprocess-minimized-sources -module-name=header1 >> %t.result
-// RUN: cat %t.result | sed 's:\\\\\?:/:g' | FileCheck --check-prefixes=CHECK,CHECK-NO-ABS %s
-//
-// RUN: echo %t.dir > %t.result
-// RUN: clang-scan-deps -compilation-database %t.cdb -j 4 -format experimental-full \
-// RUN:   -mode preprocess-minimized-sources -module-name=header1 >> %t.result
 // RUN: cat %t.result | sed 's:\\\\\?:/:g' | FileCheck --check-prefixes=CHECK %s
 //
 // RUN: echo %t.dir > %t_clangcl.result
 // RUN: clang-scan-deps -compilation-database %t_clangcl.cdb -j 4 -format experimental-full \
 // RUN:   -mode preprocess-minimized-sources -module-name=header1 >> %t_clangcl.result
-// RUN: cat %t_clangcl.result | sed 's:\\\\\?:/:g' | FileCheck --check-prefixes=CHECK,CHECK-NO-ABS %s
+// RUN: cat %t_clangcl.result | sed 's:\\\\\?:/:g' | FileCheck --check-prefixes=CHECK %s
 
 // CHECK: [[PREFIX:.*]]
 // CHECK-NEXT: {
@@ -38,9 +33,7 @@
 // CHECK-NEXT:       "clang-modulemap-file": "[[PREFIX]]/Inputs/module.modulemap",
 // CHECK-NEXT:       "command-line": [
 // CHECK-NEXT:         "-cc1"
-// CHECK-NO-ABS-NOT:   "-fmodule-map-file={{.*}}"
 // CHECK:              "-emit-module"
-// CHECK-NO-ABS-NOT:   "-fmodule-file={{.*}}"
 // CHECK:              "-fmodule-name=header1"
 // CHECK:              "-fno-implicit-modules"
 // CHECK:            ],

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

@@ -761,7 +761,7 @@ static int scanDepsByModName(ArrayRef<const char *> Args,
       functionObjectToCCallbackRef<void(CXModuleDependencySet *)>(Callback);
 
   CXFileDependencies *Result =
-      clang_experimental_DependencyScannerWorkerByModName_getFileDependencies_v0(
+      clang_experimental_DependencyScannerWorker_getDependenciesByModName_v0(
           Worker, Args.size(), Args.data(), ModName.c_str(),
           WorkingDirectory.c_str(), CB.Callback, CB.Context, &Error);
   if (!Result) {

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

@@ -194,9 +194,10 @@ llvm::cl::opt<bool> SkipExcludedPPRanges(
         "until reaching the end directive."),
     llvm::cl::init(true), llvm::cl::cat(DependencyScannerCategory));
 
-llvm::cl::opt<std::string> ModuleName("module-name", llvm::cl::Optional,
-                                      llvm::cl::desc("module name"),
-                                      llvm::cl::cat(DependencyScannerCategory));
+llvm::cl::opt<std::string> ModuleName(
+    "module-name", llvm::cl::Optional,
+    llvm::cl::desc("the module of which the dependencies are to be computed"),
+    llvm::cl::cat(DependencyScannerCategory));
 
 llvm::cl::opt<bool> Verbose("v", llvm::cl::Optional,
                             llvm::cl::desc("Use verbose output."),

clang/tools/libclang/CDependencies.cpp

@@ -222,6 +222,7 @@ getFileDependencies(CXDependencyScannerWorker W, int argc,
   DependencyScanningWorker *Worker = unwrap(W);
   SmallString<128> FullPath;
 
+  // A helper function to create a fake source file name.
   auto GetFakeSrcFile = [&]() {
     FullPath = Worker->getModuleName();
     llvm::sys::fs::make_absolute(WorkingDirectory, FullPath);
@@ -232,11 +233,16 @@ getFileDependencies(CXDependencyScannerWorker W, int argc,
   if (StringRef(argv[1]) == "-cc1") {
     for (int i = 2; i < argc; ++i)
       Compilation.push_back(argv[i]);
+    // The fake source file has to be added to the argument list here because
+    // the standard input will be used as the default input if we don't do so.
     if (Worker->getModuleName())
       Compilation.push_back(GetFakeSrcFile());
   } else {
     // Run the driver to get -cc1 args.
     std::vector<const char *> CArgs = llvm::makeArrayRef(argv, argv + argc);
+    // The fake source file has to be added to the argument list here because
+    // the driver will error out and the standard input will be used as the
+    // default input if we don't do so.
     if (Worker->getModuleName())
       CArgs.push_back(GetFakeSrcFile());
     IntrusiveRefCntPtr<DiagnosticsEngine>
@@ -280,7 +286,7 @@ clang_experimental_DependencyScannerWorker_getFileDependencies_v1(
 }
 
 CXFileDependencies *
-clang_experimental_DependencyScannerWorkerByModName_getFileDependencies_v0(
+clang_experimental_DependencyScannerWorker_getDependenciesByModName_v0(
     CXDependencyScannerWorker W, int argc, const char *const *argv,
     const char *ModuleName, const char *WorkingDirectory,
     CXModuleDiscoveredCallback *MDC, void *Context, CXString *error) {

clang/tools/libclang/libclang.exports

@@ -166,7 +166,7 @@ clang_experimental_DependencyScannerWorker_create_v0
 clang_experimental_DependencyScannerWorker_dispose_v0
 clang_experimental_DependencyScannerWorker_getFileDependencies_v0
 clang_experimental_DependencyScannerWorker_getFileDependencies_v1
-clang_experimental_DependencyScannerWorkerByModName_getFileDependencies_v0
+clang_experimental_DependencyScannerWorker_getDependenciesByModName_v0
 clang_experimental_FileDependencies_dispose
 clang_experimental_ModuleDependencySet_dispose
 clang_findIncludesInFile