This is an archive of the discontinued LLVM Phabricator instance.

Differential D32909

[Tooling] Remove redundant check, NFCi
ClosedPublic

Authored by krasimir on May 5 2017, 7:06 AM.

Details

Reviewers
bkramer
klimek
Commits
rG024b0644a6bb: [Tooling] Remove redundant check, NFCi
rC302236: [Tooling] Remove redundant check, NFCi
rL302236: [Tooling] Remove redundant check, NFCi
Summary

The Database check looks redundant.

Diff Detail

Event Timeline

krasimir created this revision.May 5 2017, 7:06 AM
Herald added a subscriber: klimek. · View Herald TranscriptMay 5 2017, 7:06 AM
klimek accepted this revision.May 5 2017, 7:14 AM

lg

This revision is now accepted and ready to land.May 5 2017, 7:14 AM
Closed by commit rL302236: [Tooling] Remove redundant check, NFCi (authored by krasimir). · Explain WhyMay 5 2017, 7:22 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Tooling/
8 lines

Diff 97952

lib/Tooling/JSONCompilationDatabase.cpp

Show First 20 Lines • Show All 140 Lines • ▼ Show 20 Linesstd::vector<std::string> unescapeCommandLine(JSONCommandLineSyntax Syntax,
return parser.parse(); return parser.parse();
} }
class JSONCompilationDatabasePlugin : public CompilationDatabasePlugin { class JSONCompilationDatabasePlugin : public CompilationDatabasePlugin {
std::unique_ptr<CompilationDatabase> std::unique_ptr<CompilationDatabase>
loadFromDirectory(StringRef Directory, std::string &ErrorMessage) override { loadFromDirectory(StringRef Directory, std::string &ErrorMessage) override {
SmallString<1024> JSONDatabasePath(Directory); SmallString<1024> JSONDatabasePath(Directory);
llvm::sys::path::append(JSONDatabasePath, "compile_commands.json"); llvm::sys::path::append(JSONDatabasePath, "compile_commands.json");
std::unique_ptr<CompilationDatabase> Database( return JSONCompilationDatabase::loadFromFile(
JSONCompilationDatabase::loadFromFile( JSONDatabasePath, ErrorMessage, JSONCommandLineSyntax::AutoDetect);
JSONDatabasePath, ErrorMessage, JSONCommandLineSyntax::AutoDetect));
if (!Database)
return nullptr;
return Database;
} }
}; };
} // end namespace } // end namespace
// Register the JSONCompilationDatabasePlugin with the // Register the JSONCompilationDatabasePlugin with the
// CompilationDatabasePluginRegistry using this statically initialized variable. // CompilationDatabasePluginRegistry using this statically initialized variable.
static CompilationDatabasePluginRegistry::Add<JSONCompilationDatabasePlugin> static CompilationDatabasePluginRegistry::Add<JSONCompilationDatabasePlugin>
▲ Show 20 Lines • Show All 217 Lines • Show Last 20 Lines