jansvoboda11 created this revision.
jansvoboda11 added reviewers: Bigcheese, dexonsmith, arphaman.
jansvoboda11 requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
This patch simplifies the dependency scanner API. Made possibly by D108979
<https://reviews.llvm.org/D108979>.
Depends on D108980 <https://reviews.llvm.org/D108980>.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D108981
Files:
clang/include/clang/Tooling/DependencyScanning/DependencyScanningTool.h
clang/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h
clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp
clang/tools/clang-scan-deps/ClangScanDeps.cpp
Index: clang/tools/clang-scan-deps/ClangScanDeps.cpp
===================================================================
--- clang/tools/clang-scan-deps/ClangScanDeps.cpp
+++ clang/tools/clang-scan-deps/ClangScanDeps.cpp
@@ -508,10 +508,8 @@
for (unsigned I = 0; I < Pool.getThreadCount(); ++I)
WorkerTools.push_back(std::make_unique<DependencyScanningTool>(Service));
- std::vector<SingleCommandCompilationDatabase> Inputs;
- for (tooling::CompileCommand Cmd :
- AdjustingCompilations->getAllCompileCommands())
- Inputs.emplace_back(Cmd);
+ std::vector<tooling::CompileCommand> Inputs =
+ AdjustingCompilations->getAllCompileCommands();
std::atomic<bool> HadErrors(false);
FullDeps FD;
@@ -527,7 +525,7 @@
&DependencyOS, &Errs]() {
llvm::StringSet<> AlreadySeenModules;
while (true) {
- const SingleCommandCompilationDatabase *Input;
+ const tooling::CompileCommand *Input;
std::string Filename;
std::string CWD;
size_t LocalIndex;
@@ -538,19 +536,19 @@
return;
LocalIndex = Index;
Input = &Inputs[Index++];
- tooling::CompileCommand Cmd = Input->getAllCompileCommands()[0];
- Filename = std::move(Cmd.Filename);
- CWD = std::move(Cmd.Directory);
+ Filename = std::move(Input->Filename);
+ CWD = std::move(Input->Directory);
}
// Run the tool on it.
if (Format == ScanningOutputFormat::Make) {
- auto MaybeFile = WorkerTools[I]->getDependencyFile(*Input, CWD);
+ auto MaybeFile =
+ WorkerTools[I]->getDependencyFile(Input->CommandLine, CWD);
if (handleMakeDependencyToolResult(Filename, MaybeFile, DependencyOS,
Errs))
HadErrors = true;
} else {
auto MaybeFullDeps = WorkerTools[I]->getFullDependencies(
- *Input, CWD, AlreadySeenModules);
+ Input->CommandLine, CWD, AlreadySeenModules);
if (handleFullDependencyToolResult(Filename, MaybeFullDeps, FD,
LocalIndex, DependencyOS, Errs))
HadErrors = true;
Index: clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp
===================================================================
--- clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp
+++ clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp
@@ -50,7 +50,7 @@
: Worker(Service) {}
llvm::Expected<std::string> DependencyScanningTool::getDependencyFile(
- const tooling::CompilationDatabase &Compilations, StringRef CWD) {
+ const std::vector<std::string> &CommandLine, StringRef CWD) {
/// Prints out all of the gathered dependencies into a string.
class MakeDependencyPrinterConsumer : public DependencyConsumer {
public:
@@ -102,17 +102,6 @@
std::vector<std::string> Dependencies;
};
- // We expect a single command here because if a source file occurs multiple
- // times in the original CDB, then `computeDependencies` would run the
- // `DependencyScanningAction` once for every time the input occured in the
- // CDB. Instead we split up the CDB into single command chunks to avoid this
- // behavior.
- assert(Compilations.getAllCompileCommands().size() == 1 &&
- "Expected a compilation database with a single command!");
- // FIXME: Avoid this copy.
- std::vector<std::string> CommandLine =
- Compilations.getAllCompileCommands().front().CommandLine;
-
MakeDependencyPrinterConsumer Consumer;
auto Result = Worker.computeDependencies(CWD, CommandLine, Consumer);
if (Result)
@@ -124,7 +113,7 @@
llvm::Expected<FullDependenciesResult>
DependencyScanningTool::getFullDependencies(
- const tooling::CompilationDatabase &Compilations, StringRef CWD,
+ const std::vector<std::string> &CommandLine, StringRef CWD,
const llvm::StringSet<> &AlreadySeen) {
class FullDependencyPrinterConsumer : public DependencyConsumer {
public:
@@ -188,17 +177,6 @@
const llvm::StringSet<> &AlreadySeen;
};
- // We expect a single command here because if a source file occurs multiple
- // times in the original CDB, then `computeDependencies` would run the
- // `DependencyScanningAction` once for every time the input occured in the
- // CDB. Instead we split up the CDB into single command chunks to avoid this
- // behavior.
- assert(Compilations.getAllCompileCommands().size() == 1 &&
- "Expected a compilation database with a single command!");
- // FIXME: Avoid this copy.
- std::vector<std::string> CommandLine =
- Compilations.getAllCompileCommands().front().CommandLine;
-
FullDependencyPrinterConsumer Consumer(AlreadySeen);
llvm::Error Result = Worker.computeDependencies(CWD, CommandLine, Consumer);
if (Result)
Index: clang/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h
===================================================================
--- clang/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h
+++ clang/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h
@@ -14,7 +14,6 @@
#include "clang/Basic/LLVM.h"
#include "clang/Frontend/PCHContainerOperations.h"
#include "clang/Lex/PreprocessorExcludedConditionalDirectiveSkipMapping.h"
-#include "clang/Tooling/CompilationDatabase.h"
#include "clang/Tooling/DependencyScanning/DependencyScanningService.h"
#include "clang/Tooling/DependencyScanning/ModuleDepCollector.h"
#include "llvm/Support/Error.h"
@@ -30,24 +29,6 @@
class DependencyScanningWorkerFilesystem;
-/// Compilation database that holds and reports a single compile command.
-class SingleCommandCompilationDatabase : public CompilationDatabase {
- CompileCommand Command;
-
-public:
- SingleCommandCompilationDatabase(CompileCommand Cmd)
- : Command(std::move(Cmd)) {}
-
- std::vector<CompileCommand>
- getCompileCommands(StringRef FilePath) const override {
- return {Command};
- }
-
- std::vector<CompileCommand> getAllCompileCommands() const override {
- return {Command};
- }
-};
-
class DependencyConsumer {
public:
virtual ~DependencyConsumer() {}
Index: clang/include/clang/Tooling/DependencyScanning/DependencyScanningTool.h
===================================================================
--- clang/include/clang/Tooling/DependencyScanning/DependencyScanningTool.h
+++ clang/include/clang/Tooling/DependencyScanning/DependencyScanningTool.h
@@ -82,8 +82,7 @@
/// \returns A \c StringError with the diagnostic output if clang errors
/// occurred, dependency file contents otherwise.
llvm::Expected<std::string>
- getDependencyFile(const tooling::CompilationDatabase &Compilations,
- StringRef CWD);
+ getDependencyFile(const std::vector<std::string> &CommandLine, StringRef CWD);
/// Collect the full module dependency graph for the input, ignoring any
/// modules which have already been seen.
@@ -97,7 +96,7 @@
/// \returns a \c StringError with the diagnostic output if clang errors
/// occurred, \c FullDependencies otherwise.
llvm::Expected<FullDependenciesResult>
- getFullDependencies(const tooling::CompilationDatabase &Compilations,
+ getFullDependencies(const std::vector<std::string> &CommandLine,
StringRef CWD, const llvm::StringSet<> &AlreadySeen);
private:
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
