This is an archive of the discontinued LLVM Phabricator instance.

Differential D35825

[clangd] Reuse compile commands during reparse
ClosedPublic

Authored by krasimir on Jul 25 2017, 2:25 AM.

Details

Reviewers
ilya-biryukov
Commits
rGe4130d52dae7: [clangd] Reuse compile commands during reparse
rCTE308970: [clangd] Reuse compile commands during reparse
rL308970: [clangd] Reuse compile commands during reparse
Summary

Previously we always queried the compilation database and discarded the results
if the file was already opened.

Diff Detail

Event Timeline

krasimir created this revision.Jul 25 2017, 2:25 AM
Harbormaster completed remote builds in B8559: Diff 108023.Jul 25 2017, 2:25 AM
ilya-biryukov added inline comments.Jul 25 2017, 2:38 AM
clangd/ClangdUnit.cpp
248

Also have to call it in codeComplete.

krasimir updated this revision to Diff 108033.Jul 25 2017, 2:54 AM
  • Address review comment
Harbormaster completed remote builds in B8561: Diff 108033.Jul 25 2017, 2:55 AM
krasimir marked an inline comment as done.Jul 25 2017, 2:55 AM
ilya-biryukov accepted this revision.Jul 25 2017, 3:03 AM

LGTM

This revision is now accepted and ready to land.Jul 25 2017, 3:03 AM
Closed by commit rL308970: [clangd] Reuse compile commands during reparse (authored by krasimir). · Explain WhyJul 25 2017, 4:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clangd/
2 lines
9 lines

Diff 108023

clangd/ClangdUnit.cpp

Show First 20 Lines • Show All 239 Lines • ▼ Show 20 Lines
} }
void ClangdUnit::reparse(StringRef Contents, void ClangdUnit::reparse(StringRef Contents,
IntrusiveRefCntPtr<vfs::FileSystem> VFS) { IntrusiveRefCntPtr<vfs::FileSystem> VFS) {
std::vector<const char *> ArgStrs; std::vector<const char *> ArgStrs;
for (const auto &S : Command.CommandLine) for (const auto &S : Command.CommandLine)
ArgStrs.push_back(S.c_str()); ArgStrs.push_back(S.c_str());
VFS->setCurrentWorkingDirectory(Command.Directory);
ilya-biryukovUnsubmitted
Done
ReplyInline Actions

Also have to call it in codeComplete.

ilya-biryukov: Also have to call it in `codeComplete`.
std::unique_ptr<CompilerInvocation> CI; std::unique_ptr<CompilerInvocation> CI;
{ {
// FIXME(ibiryukov): store diagnostics from CommandLine when we start // FIXME(ibiryukov): store diagnostics from CommandLine when we start
// reporting them. // reporting them.
EmptyDiagsConsumer CommandLineDiagsConsumer; EmptyDiagsConsumer CommandLineDiagsConsumer;
IntrusiveRefCntPtr<DiagnosticsEngine> CommandLineDiagsEngine = IntrusiveRefCntPtr<DiagnosticsEngine> CommandLineDiagsEngine =
CompilerInstance::createDiagnostics(new DiagnosticOptions, CompilerInstance::createDiagnostics(new DiagnosticOptions,
&CommandLineDiagsConsumer, false); &CommandLineDiagsConsumer, false);
▲ Show 20 Lines • Show All 521 Lines • Show Last 20 Lines

clangd/ClangdUnitStore.h

Show First 20 Lines • Show All 73 Lines • ▼ Show 20 Linesprivate:
template <class Func> template <class Func>
void runOnUnitImpl(PathRef File, StringRef FileContents, void runOnUnitImpl(PathRef File, StringRef FileContents,
StringRef ResourceDir, GlobalCompilationDatabase &CDB, StringRef ResourceDir, GlobalCompilationDatabase &CDB,
std::shared_ptr<PCHContainerOperations> PCHs, std::shared_ptr<PCHContainerOperations> PCHs,
bool ReparseBeforeAction, bool ReparseBeforeAction,
IntrusiveRefCntPtr<vfs::FileSystem> VFS, Func Action) { IntrusiveRefCntPtr<vfs::FileSystem> VFS, Func Action) {
std::lock_guard<std::mutex> Lock(Mutex); std::lock_guard<std::mutex> Lock(Mutex);
auto It = OpenedFiles.find(File);
if (It == OpenedFiles.end()) {
auto Commands = getCompileCommands(CDB, File); auto Commands = getCompileCommands(CDB, File);
assert(!Commands.empty() && assert(!Commands.empty() &&
"getCompileCommands should add default command"); "getCompileCommands should add default command");
VFS->setCurrentWorkingDirectory(Commands.front().Directory);
auto It = OpenedFiles.find(File);
if (It == OpenedFiles.end()) {
It = OpenedFiles It = OpenedFiles
.insert(std::make_pair(File, ClangdUnit(File, FileContents, .insert(std::make_pair(File, ClangdUnit(File, FileContents,
ResourceDir, PCHs, ResourceDir, PCHs,
Commands, VFS))) Commands, VFS)))
.first; .first;
} else if (ReparseBeforeAction) { } else if (ReparseBeforeAction) {
It->second.reparse(FileContents, VFS); It->second.reparse(FileContents, VFS);
} }
Show All 13 Lines