This is an archive of the discontinued LLVM Phabricator instance.

Differential D39652

[clang-diff] NFC: factor out getCompilationDatabase()
Needs ReviewPublic

Authored by johannes on Nov 5 2017, 11:03 AM.

Details

Reviewers
arphaman

Diff Detail

Event Timeline

johannes created this revision.Nov 5 2017, 11:03 AM

Revision Contents

PathSize
tools/
clang-diff/
40 lines

Diff 121640

tools/clang-diff/ClangDiff.cpp

Show First 20 Lines • Show All 78 Lines • ▼ Show 20 Lines auto AdjustingCompilations =
std::move(Compilations)); std::move(Compilations));
AdjustingCompilations->appendArgumentsAdjuster( AdjustingCompilations->appendArgumentsAdjuster(
getInsertArgumentAdjuster(ArgsBefore, ArgumentInsertPosition::BEGIN)); getInsertArgumentAdjuster(ArgsBefore, ArgumentInsertPosition::BEGIN));
AdjustingCompilations->appendArgumentsAdjuster( AdjustingCompilations->appendArgumentsAdjuster(
getInsertArgumentAdjuster(ArgsAfter, ArgumentInsertPosition::END)); getInsertArgumentAdjuster(ArgsAfter, ArgumentInsertPosition::END));
Compilations = std::move(AdjustingCompilations); Compilations = std::move(AdjustingCompilations);
} }
static std::unique_ptr<ASTUnit> static std::unique_ptr<CompilationDatabase>
getAST(const std::unique_ptr<CompilationDatabase> &CommonCompilations, getCompilationDatabase(StringRef Filename) {
const StringRef Filename) {
std::string ErrorMessage; std::string ErrorMessage;
std::unique_ptr<CompilationDatabase> Compilations; std::unique_ptr<CompilationDatabase> Compilations =
if (!CommonCompilations) { CompilationDatabase::autoDetectFromSource(
Compilations = CompilationDatabase::autoDetectFromSource(
BuildPath.empty() ? Filename : BuildPath, ErrorMessage); BuildPath.empty() ? Filename : BuildPath, ErrorMessage);
if (!Compilations) { if (!Compilations) {
llvm::errs() llvm::errs()
<< "Error while trying to load a compilation database, running " << "Error while trying to load a compilation database, running "
"without flags.\n" "without flags.\n"
<< ErrorMessage; << ErrorMessage;
Compilations = Compilations = llvm::make_unique<clang::tooling::FixedCompilationDatabase>(
llvm::make_unique<clang::tooling::FixedCompilationDatabase>(
".", std::vector<std::string>()); ".", std::vector<std::string>());
} }
}
addExtraArgs(Compilations); addExtraArgs(Compilations);
return Compilations;
}
static std::unique_ptr<ASTUnit>
getAST(const std::unique_ptr<CompilationDatabase> &CommonCompilations,
const StringRef Filename) {
std::array<std::string, 1> Files = {{Filename}}; std::array<std::string, 1> Files = {{Filename}};
ClangTool Tool(Compilations ? *Compilations : *CommonCompilations, Files); std::unique_ptr<CompilationDatabase> FileCompilations;
if (!CommonCompilations)
FileCompilations = getCompilationDatabase(Filename);
ClangTool Tool(CommonCompilations ? *CommonCompilations : *FileCompilations,
Files);
std::vector<std::unique_ptr<ASTUnit>> ASTs; std::vector<std::unique_ptr<ASTUnit>> ASTs;
Tool.buildASTs(ASTs); Tool.buildASTs(ASTs);
if (ASTs.size() != Files.size()) if (ASTs.size() != Files.size())
return nullptr; return nullptr;
return std::move(ASTs[0]); return std::move(ASTs[0]);
} }
static char hexdigit(int N) { return N &= 0xf, N + (N < 10 ? '0' : 'a' - 10); } static char hexdigit(int N) { return N &= 0xf, N + (N < 10 ? '0' : 'a' - 10); }
▲ Show 20 Lines • Show All 419 Lines • Show Last 20 Lines