This is an archive of the discontinued LLVM Phabricator instance.

Differential D78833

[clangd] Disable all dependency outputs
ClosedPublic

Authored by kadircet on Apr 24 2020, 2:52 PM.

Details

Reviewers
sammccall
Commits
rG52f2d6d4b20d: [clangd] Disable all dependency outputs
rG294b9d43cae7: [clangd] Disable all dependency outputs
Summary

Fixes https://github.com/clangd/clangd/issues/322

Diff Detail

Event Timeline

kadircet created this revision.Apr 24 2020, 2:52 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 24 2020, 2:53 PM
Herald added subscribers: cfe-commits, usaxena95, arphaman and 3 others. · View Herald Transcript
Harbormaster failed remote builds in B54627: Diff 260002!Apr 24 2020, 4:49 PM
Herald added a subscriber: ormris. · View Herald TranscriptApr 24 2020, 4:49 PM
sammccall accepted this revision.Apr 24 2020, 5:06 PM
This revision is now accepted and ready to land.Apr 24 2020, 5:06 PM
Closed by commit rG294b9d43cae7: [clangd] Disable all dependency outputs (authored by kadircet). · Explain WhyApr 25 2020, 5:16 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang-tools-extra/
clangd/
9 lines
test/
12 lines

Diff 260086

clang-tools-extra/clangd/Compiler.cpp

Show First 20 Lines • Show All 59 Lines • ▼ Show 20 Lines std::unique_ptr<CompilerInvocation> CI = createInvocationFromCommandLine(
ArgStrs, CommandLineDiagsEngine, Inputs.FS, ArgStrs, CommandLineDiagsEngine, Inputs.FS,
/*ShouldRecoverOnErrors=*/true, CC1Args); /*ShouldRecoverOnErrors=*/true, CC1Args);
if (!CI) if (!CI)
return nullptr; return nullptr;
// createInvocationFromCommandLine sets DisableFree. // createInvocationFromCommandLine sets DisableFree.
CI->getFrontendOpts().DisableFree = false; CI->getFrontendOpts().DisableFree = false;
CI->getLangOpts()->CommentOpts.ParseAllComments = true; CI->getLangOpts()->CommentOpts.ParseAllComments = true;
CI->getLangOpts()->RetainCommentsFromSystemHeaders = true; CI->getLangOpts()->RetainCommentsFromSystemHeaders = true;
// Disable any dependency outputting, we don't want to generate files or write
// to stdout/stderr.
CI->getDependencyOutputOpts().ShowIncludesDest =
ShowIncludesDestination::None;
CI->getDependencyOutputOpts().OutputFile.clear();
CI->getDependencyOutputOpts().HeaderIncludeOutputFile.clear();
CI->getDependencyOutputOpts().DOTOutputFile.clear();
CI->getDependencyOutputOpts().ModuleDependencyOutputDir.clear();
return CI; return CI;
} }
std::unique_ptr<CompilerInstance> std::unique_ptr<CompilerInstance>
prepareCompilerInstance(std::unique_ptr<clang::CompilerInvocation> CI, prepareCompilerInstance(std::unique_ptr<clang::CompilerInvocation> CI,
const PrecompiledPreamble *Preamble, const PrecompiledPreamble *Preamble,
std::unique_ptr<llvm::MemoryBuffer> Buffer, std::unique_ptr<llvm::MemoryBuffer> Buffer,
llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS, llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS,
Show All 38 Lines

clang-tools-extra/clangd/test/dependency-output.test

  • This file was added.
# RUN: clangd -lit-test < %s | FileCheck -strict-whitespace %s
{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{},"trace":"off"}}
---
{"jsonrpc":"2.0","method":"workspace/didChangeConfiguration","params":{"settings":{"compilationDatabaseChanges":{"/clangd-test/foo.c":
{"workingDirectory":"/clangd-test", "compilationCommand": ["clang", "-c", "-Xclang", "--show-includes", "-Xclang", "-sys-header-deps", "foo.c"]}}}}}
---
{"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"test:///foo.c","languageId":"cpp","version":1,"text":"int a;\n#include <stddef.h>"}}}
#CHECK-NOT: Note: including file
---
{"jsonrpc":"2.0","id":3,"method":"shutdown"}
---
{"jsonrpc":"2.0","method":"exit"}