diff --git a/clang/include/clang/Tooling/DependencyScanning/DependencyScanningTool.h b/clang/include/clang/Tooling/DependencyScanning/DependencyScanningTool.h --- a/clang/include/clang/Tooling/DependencyScanning/DependencyScanningTool.h +++ b/clang/include/clang/Tooling/DependencyScanning/DependencyScanningTool.h @@ -27,8 +27,14 @@ using LookupModuleOutputCallback = llvm::function_ref; +/// Graph of modular dependencies. +using ModuleDepsGraph = std::vector; + /// The full dependencies and module graph for a specific input. -struct FullDependencies { +struct TranslationUnitDeps { + /// The graph of direct and transitive modular dependencies. + ModuleDepsGraph ModuleGraph; + /// The identifier of the C++20 module this translation unit exports. /// /// If the translation unit is not a module then \c ID.ModuleName is empty. @@ -61,11 +67,6 @@ std::vector DriverCommandLine; }; -struct FullDependenciesResult { - FullDependencies FullDeps; - std::vector DiscoveredModules; -}; - /// The high-level implementation of the dependency discovery tool that runs on /// an individual worker thread. class DependencyScanningTool { @@ -77,18 +78,15 @@ /// Print out the dependency information into a string using the dependency /// file format that is specified in the options (-MD is the default) and - /// return it. If \p ModuleName isn't empty, this function returns the - /// dependency information of module \p ModuleName. + /// return it. /// /// \returns A \c StringError with the diagnostic output if clang errors /// occurred, dependency file contents otherwise. llvm::Expected - getDependencyFile(const std::vector &CommandLine, StringRef CWD, - llvm::Optional ModuleName = std::nullopt); + getDependencyFile(const std::vector &CommandLine, StringRef CWD); - /// Collect the full module dependency graph for the input, ignoring any - /// modules which have already been seen. If \p ModuleName isn't empty, this - /// function returns the full dependency information of module \p ModuleName. + /// Given a Clang driver command-line for a translation unit, gather the + /// modular dependencies and return the information needed for explicit build. /// /// \param AlreadySeen This stores modules which have previously been /// reported. Use the same instance for all calls to this @@ -100,12 +98,21 @@ /// arguments for dependencies. /// /// \returns a \c StringError with the diagnostic output if clang errors - /// occurred, \c FullDependencies otherwise. - llvm::Expected - getFullDependencies(const std::vector &CommandLine, - StringRef CWD, const llvm::StringSet<> &AlreadySeen, - LookupModuleOutputCallback LookupModuleOutput, - llvm::Optional ModuleName = std::nullopt); + /// occurred, \c TranslationUnitDeps otherwise. + llvm::Expected + getTranslationUnitDependencies(const std::vector &CommandLine, + StringRef CWD, + const llvm::StringSet<> &AlreadySeen, + LookupModuleOutputCallback LookupModuleOutput); + + /// Given a compilation context specified via the Clang driver command-line, + /// gather modular dependencies of module with the given name, and return the + /// information needed for explicit build. + llvm::Expected + getModuleDependencies(StringRef ModuleName, + const std::vector &CommandLine, + StringRef CWD, const llvm::StringSet<> &AlreadySeen, + LookupModuleOutputCallback LookupModuleOutput); private: DependencyScanningWorker Worker; @@ -144,7 +151,8 @@ return LookupModuleOutput(ID, Kind); } - FullDependenciesResult takeFullDependencies(); + TranslationUnitDeps takeTranslationUnitDeps(); + ModuleDepsGraph takeModuleGraphDeps(); private: std::vector Dependencies; diff --git a/clang/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h b/clang/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h --- a/clang/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h +++ b/clang/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h @@ -30,7 +30,7 @@ /// A command-line tool invocation that is part of building a TU. /// -/// \see FullDependencies::Commands. +/// \see TranslationUnitDeps::Commands. struct Command { std::string Executable; std::vector Arguments; diff --git a/clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp b/clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp --- a/clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp +++ b/clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp @@ -19,8 +19,7 @@ : Worker(Service, std::move(FS)) {} llvm::Expected DependencyScanningTool::getDependencyFile( - const std::vector &CommandLine, StringRef CWD, - llvm::Optional ModuleName) { + const std::vector &CommandLine, StringRef CWD) { /// Prints out all of the gathered dependencies into a string. class MakeDependencyPrinterConsumer : public DependencyConsumer { public: @@ -80,8 +79,7 @@ }; MakeDependencyPrinterConsumer Consumer; - auto Result = - Worker.computeDependencies(CWD, CommandLine, Consumer, ModuleName); + auto Result = Worker.computeDependencies(CWD, CommandLine, Consumer); if (Result) return std::move(Result); std::string Output; @@ -89,39 +87,63 @@ return Output; } -llvm::Expected -DependencyScanningTool::getFullDependencies( +llvm::Expected +DependencyScanningTool::getTranslationUnitDependencies( const std::vector &CommandLine, StringRef CWD, const llvm::StringSet<> &AlreadySeen, - LookupModuleOutputCallback LookupModuleOutput, - llvm::Optional ModuleName) { + LookupModuleOutputCallback LookupModuleOutput) { + FullDependencyConsumer Consumer(AlreadySeen, LookupModuleOutput); + llvm::Error Result = Worker.computeDependencies(CWD, CommandLine, Consumer); + if (Result) + return std::move(Result); + return Consumer.takeTranslationUnitDeps(); +} + +llvm::Expected DependencyScanningTool::getModuleDependencies( + StringRef ModuleName, const std::vector &CommandLine, + StringRef CWD, const llvm::StringSet<> &AlreadySeen, + LookupModuleOutputCallback LookupModuleOutput) { FullDependencyConsumer Consumer(AlreadySeen, LookupModuleOutput); llvm::Error Result = Worker.computeDependencies(CWD, CommandLine, Consumer, ModuleName); if (Result) return std::move(Result); - return Consumer.takeFullDependencies(); + return Consumer.takeModuleGraphDeps(); } -FullDependenciesResult FullDependencyConsumer::takeFullDependencies() { - FullDependenciesResult FDR; - FullDependencies &FD = FDR.FullDeps; +TranslationUnitDeps FullDependencyConsumer::takeTranslationUnitDeps() { + TranslationUnitDeps TU; - FD.ID.ContextHash = std::move(ContextHash); - FD.FileDeps = std::move(Dependencies); - FD.PrebuiltModuleDeps = std::move(PrebuiltModuleDeps); - FD.Commands = std::move(Commands); + TU.ID.ContextHash = std::move(ContextHash); + TU.FileDeps = std::move(Dependencies); + TU.PrebuiltModuleDeps = std::move(PrebuiltModuleDeps); + TU.Commands = std::move(Commands); for (auto &&M : ClangModuleDeps) { auto &MD = M.second; if (MD.ImportedByMainFile) - FD.ClangModuleDeps.push_back(MD.ID); + TU.ClangModuleDeps.push_back(MD.ID); + // TODO: Avoid handleModuleDependency even being called for modules + // we've already seen. + if (AlreadySeen.count(M.first)) + continue; + TU.ModuleGraph.push_back(std::move(MD)); + } + + return TU; +} + +ModuleDepsGraph FullDependencyConsumer::takeModuleGraphDeps() { + ModuleDepsGraph ModuleGraph; + + for (auto &&M : ClangModuleDeps) { + auto &MD = M.second; // TODO: Avoid handleModuleDependency even being called for modules // we've already seen. if (AlreadySeen.count(M.first)) continue; - FDR.DiscoveredModules.push_back(std::move(MD)); + ModuleGraph.push_back(std::move(MD)); } - return FDR; + return ModuleGraph; } diff --git a/clang/test/ClangScanDeps/modules-full-by-mod-name.cpp b/clang/test/ClangScanDeps/modules-full-by-mod-name.cpp --- a/clang/test/ClangScanDeps/modules-full-by-mod-name.cpp +++ b/clang/test/ClangScanDeps/modules-full-by-mod-name.cpp @@ -75,3 +75,5 @@ // CHECK-NEXT: "name": "header2" // CHECK-NEXT: } // CHECK-NEXT: ], +// CHECK-NEXT: "translation-units": [] +// CHECK-NEXT: } diff --git a/clang/tools/clang-scan-deps/ClangScanDeps.cpp b/clang/tools/clang-scan-deps/ClangScanDeps.cpp --- a/clang/tools/clang-scan-deps/ClangScanDeps.cpp +++ b/clang/tools/clang-scan-deps/ClangScanDeps.cpp @@ -249,18 +249,22 @@ // Thread safe. class FullDeps { public: - void mergeDeps(StringRef Input, FullDependenciesResult FDR, + void mergeDeps(StringRef Input, TranslationUnitDeps TUDeps, size_t InputIndex) { - FullDependencies &FD = FDR.FullDeps; - InputDeps ID; ID.FileName = std::string(Input); - ID.ContextHash = std::move(FD.ID.ContextHash); - ID.FileDeps = std::move(FD.FileDeps); - ID.ModuleDeps = std::move(FD.ClangModuleDeps); + ID.ContextHash = std::move(TUDeps.ID.ContextHash); + ID.FileDeps = std::move(TUDeps.FileDeps); + ID.ModuleDeps = std::move(TUDeps.ClangModuleDeps); + mergeDeps(std::move(TUDeps.ModuleGraph), InputIndex); + ID.DriverCommandLine = std::move(TUDeps.DriverCommandLine); + ID.Commands = std::move(TUDeps.Commands); + Inputs.push_back(std::move(ID)); + } + void mergeDeps(ModuleDepsGraph Graph, size_t InputIndex) { std::unique_lock ul(Lock); - for (const ModuleDeps &MD : FDR.DiscoveredModules) { + for (const ModuleDeps &MD : Graph) { auto I = Modules.find({MD.ID, 0}); if (I != Modules.end()) { I->first.InputIndex = std::min(I->first.InputIndex, InputIndex); @@ -268,10 +272,6 @@ } Modules.insert(I, {{MD.ID, InputIndex}, std::move(MD)}); } - - ID.DriverCommandLine = std::move(FD.DriverCommandLine); - ID.Commands = std::move(FD.Commands); - Inputs.push_back(std::move(ID)); } void printFullOutput(raw_ostream &OS) { @@ -378,13 +378,12 @@ std::vector Inputs; }; -static bool handleFullDependencyToolResult( - const std::string &Input, - llvm::Expected &MaybeFullDeps, FullDeps &FD, - size_t InputIndex, SharedStream &OS, SharedStream &Errs) { - if (!MaybeFullDeps) { +static bool handleTranslationUnitResult( + StringRef Input, llvm::Expected &MaybeTUDeps, + FullDeps &FD, size_t InputIndex, SharedStream &OS, SharedStream &Errs) { + if (!MaybeTUDeps) { llvm::handleAllErrors( - MaybeFullDeps.takeError(), [&Input, &Errs](llvm::StringError &Err) { + MaybeTUDeps.takeError(), [&Input, &Errs](llvm::StringError &Err) { Errs.applyLocked([&](raw_ostream &OS) { OS << "Error while scanning dependencies for " << Input << ":\n"; OS << Err.getMessage(); @@ -392,7 +391,25 @@ }); return true; } - FD.mergeDeps(Input, std::move(*MaybeFullDeps), InputIndex); + FD.mergeDeps(Input, std::move(*MaybeTUDeps), InputIndex); + return false; +} + +static bool handleModuleResult( + StringRef ModuleName, llvm::Expected &MaybeModuleGraph, + FullDeps &FD, size_t InputIndex, SharedStream &OS, SharedStream &Errs) { + if (!MaybeModuleGraph) { + llvm::handleAllErrors(MaybeModuleGraph.takeError(), + [&ModuleName, &Errs](llvm::StringError &Err) { + Errs.applyLocked([&](raw_ostream &OS) { + OS << "Error while scanning dependencies for " + << ModuleName << ":\n"; + OS << Err.getMessage(); + }); + }); + return true; + } + FD.mergeDeps(std::move(*MaybeModuleGraph), InputIndex); return false; } @@ -570,17 +587,23 @@ // Run the tool on it. if (Format == ScanningOutputFormat::Make) { - auto MaybeFile = WorkerTools[I]->getDependencyFile( - Input->CommandLine, CWD, MaybeModuleName); + auto MaybeFile = + WorkerTools[I]->getDependencyFile(Input->CommandLine, CWD); if (handleMakeDependencyToolResult(Filename, MaybeFile, DependencyOS, Errs)) HadErrors = true; + } else if (MaybeModuleName) { + auto MaybeModuleDepsGraph = WorkerTools[I]->getModuleDependencies( + *MaybeModuleName, Input->CommandLine, CWD, AlreadySeenModules, + LookupOutput); + if (handleModuleResult(*MaybeModuleName, MaybeModuleDepsGraph, FD, + LocalIndex, DependencyOS, Errs)) + HadErrors = true; } else { - auto MaybeFullDeps = WorkerTools[I]->getFullDependencies( - Input->CommandLine, CWD, AlreadySeenModules, LookupOutput, - MaybeModuleName); - if (handleFullDependencyToolResult(Filename, MaybeFullDeps, FD, - LocalIndex, DependencyOS, Errs)) + auto MaybeTUDeps = WorkerTools[I]->getTranslationUnitDependencies( + Input->CommandLine, CWD, AlreadySeenModules, LookupOutput); + if (handleTranslationUnitResult(Filename, MaybeTUDeps, FD, LocalIndex, + DependencyOS, Errs)) HadErrors = true; } }