diff options
| -rw-r--r-- | clang-tools-extra/clangd/Context.cpp | 2 | ||||
| -rw-r--r-- | clang-tools-extra/clangd/tool/ClangdMain.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/clang-tools-extra/clangd/Context.cpp b/clang-tools-extra/clangd/Context.cpp index 7ecaced52c4..1a9ef24ff56 100644 --- a/clang-tools-extra/clangd/Context.cpp +++ b/clang-tools-extra/clangd/Context.cpp @@ -13,7 +13,7 @@ namespace clang { namespace clangd { -Context Context::empty() { return Context(/*Data=*/nullptr); } +Context Context::empty() { return Context(/*DataPtr=*/nullptr); } Context::Context(std::shared_ptr<const Data> DataPtr) : DataPtr(std::move(DataPtr)) {} diff --git a/clang-tools-extra/clangd/tool/ClangdMain.cpp b/clang-tools-extra/clangd/tool/ClangdMain.cpp index e35e16fafdf..00d18185275 100644 --- a/clang-tools-extra/clangd/tool/ClangdMain.cpp +++ b/clang-tools-extra/clangd/tool/ClangdMain.cpp @@ -149,10 +149,11 @@ int main(int argc, char *argv[]) { return 1; } - // Ignore -j option if -run-synchonously is used. - // FIXME: a warning should be shown here. - if (RunSynchronously) + if (RunSynchronously) { + if (WorkerThreadsCount.getNumOccurrences()) + llvm::errs() << "Ignoring -j because -run-synchronously is set.\n"; WorkerThreadsCount = 0; + } // Validate command line arguments. llvm::Optional<llvm::raw_fd_ostream> InputMirrorStream; |
