nridge created this revision.
nridge added reviewers: kadircet, sammccall.
Herald added a subscriber: arphaman.
Herald added a project: All.
nridge requested review of this revision.
Herald added subscribers: cfe-commits, MaskRay, ilya-biryukov.
Herald added a project: clang-tools-extra.
Use it instead of tooling::ArgumentsAdjuster as the interface between
CommandMangler and OverlayCDB.
This is a more expressive interface that gives CommandMangler access
to other fields of tooling::CompileCommand as well, e.g. Directory.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D133756
Files:
clang-tools-extra/clangd/ClangdLSPServer.cpp
clang-tools-extra/clangd/CompileCommands.cpp
clang-tools-extra/clangd/CompileCommands.h
clang-tools-extra/clangd/GlobalCompilationDatabase.cpp
clang-tools-extra/clangd/GlobalCompilationDatabase.h
clang-tools-extra/clangd/indexer/IndexerMain.cpp
clang-tools-extra/clangd/tool/Check.cpp
clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
clang-tools-extra/clangd/unittests/ClangdTests.cpp
clang-tools-extra/clangd/unittests/CompileCommandsTests.cpp
clang-tools-extra/clangd/unittests/GlobalCompilationDatabaseTests.cpp
clang-tools-extra/clangd/unittests/TestTU.cpp
Index: clang-tools-extra/clangd/unittests/TestTU.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/TestTU.cpp
+++ clang-tools-extra/clangd/unittests/TestTU.cpp
@@ -59,7 +59,7 @@
Argv.push_back(FullFilename);
auto Mangler = CommandMangler::forTests();
- Mangler.adjust(Inputs.CompileCommand.CommandLine, FullFilename);
+ Mangler->adjust(Inputs.CompileCommand, FullFilename);
Inputs.CompileCommand.Filename = FullFilename;
Inputs.CompileCommand.Directory = testRoot();
Inputs.Contents = Code;
Index: clang-tools-extra/clangd/unittests/GlobalCompilationDatabaseTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/GlobalCompilationDatabaseTests.cpp
+++ clang-tools-extra/clangd/unittests/GlobalCompilationDatabaseTests.cpp
@@ -137,13 +137,14 @@
}
TEST_F(OverlayCDBTest, Adjustments) {
- OverlayCDB CDB(Base.get(), {"-DFallback"},
- [](const std::vector<std::string> &Cmd, llvm::StringRef File) {
- auto Ret = Cmd;
- Ret.push_back(
- ("-DAdjust_" + llvm::sys::path::filename(File)).str());
- return Ret;
- });
+ struct Adjuster : public CompileCommandsAdjuster {
+ void adjust(tooling::CompileCommand &Cmd,
+ llvm::StringRef File) const override {
+ Cmd.CommandLine.push_back(
+ ("-DAdjust_" + llvm::sys::path::filename(File)).str());
+ }
+ };
+ OverlayCDB CDB(Base.get(), {"-DFallback"}, std::make_unique<Adjuster>());
// Command from underlying gets adjusted.
auto Cmd = *CDB.getCompileCommand(testPath("foo.cc"));
EXPECT_THAT(Cmd.CommandLine, ElementsAre("clang", "-DA=1", testPath("foo.cc"),
Index: clang-tools-extra/clangd/unittests/CompileCommandsTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/CompileCommandsTests.cpp
+++ clang-tools-extra/clangd/unittests/CompileCommandsTests.cpp
@@ -42,66 +42,73 @@
// Other tests just verify presence/absence of certain args.
TEST(CommandMangler, Everything) {
auto Mangler = CommandMangler::forTests();
- Mangler.ClangPath = testPath("fake/clang");
- Mangler.ResourceDir = testPath("fake/resources");
- Mangler.Sysroot = testPath("fake/sysroot");
- std::vector<std::string> Cmd = {"clang++", "--", "foo.cc", "bar.cc"};
- Mangler.adjust(Cmd, "foo.cc");
- EXPECT_THAT(Cmd, ElementsAre(testPath("fake/clang++"),
- "-resource-dir=" + testPath("fake/resources"),
- "-isysroot", testPath("fake/sysroot"), "--",
- "foo.cc"));
+ Mangler->ClangPath = testPath("fake/clang");
+ Mangler->ResourceDir = testPath("fake/resources");
+ Mangler->Sysroot = testPath("fake/sysroot");
+ tooling::CompileCommand Cmd;
+ Cmd.CommandLine = {"clang++", "--", "foo.cc", "bar.cc"};
+ Mangler->adjust(Cmd, "foo.cc");
+ EXPECT_THAT(Cmd.CommandLine,
+ ElementsAre(testPath("fake/clang++"),
+ "-resource-dir=" + testPath("fake/resources"),
+ "-isysroot", testPath("fake/sysroot"), "--",
+ "foo.cc"));
}
TEST(CommandMangler, FilenameMismatch) {
auto Mangler = CommandMangler::forTests();
- Mangler.ClangPath = testPath("clang");
+ Mangler->ClangPath = testPath("clang");
// Our compile flags refer to foo.cc...
- std::vector<std::string> Cmd = {"clang", "foo.cc"};
+ tooling::CompileCommand Cmd;
+ Cmd.CommandLine = {"clang", "foo.cc"};
// but we're applying it to foo.h...
- Mangler.adjust(Cmd, "foo.h");
+ Mangler->adjust(Cmd, "foo.h");
// so transferCompileCommand should add -x c++-header to preserve semantics.
- EXPECT_THAT(
- Cmd, ElementsAre(testPath("clang"), "-x", "c++-header", "--", "foo.h"));
+ EXPECT_THAT(Cmd.CommandLine, ElementsAre(testPath("clang"), "-x",
+ "c++-header", "--", "foo.h"));
}
TEST(CommandMangler, ResourceDir) {
auto Mangler = CommandMangler::forTests();
- Mangler.ResourceDir = testPath("fake/resources");
- std::vector<std::string> Cmd = {"clang++", "foo.cc"};
- Mangler.adjust(Cmd, "foo.cc");
- EXPECT_THAT(Cmd, Contains("-resource-dir=" + testPath("fake/resources")));
+ Mangler->ResourceDir = testPath("fake/resources");
+ tooling::CompileCommand Cmd;
+ Cmd.CommandLine = {"clang++", "foo.cc"};
+ Mangler->adjust(Cmd, "foo.cc");
+ EXPECT_THAT(Cmd.CommandLine,
+ Contains("-resource-dir=" + testPath("fake/resources")));
}
TEST(CommandMangler, Sysroot) {
auto Mangler = CommandMangler::forTests();
- Mangler.Sysroot = testPath("fake/sysroot");
+ Mangler->Sysroot = testPath("fake/sysroot");
- std::vector<std::string> Cmd = {"clang++", "foo.cc"};
- Mangler.adjust(Cmd, "foo.cc");
- EXPECT_THAT(llvm::join(Cmd, " "),
+ tooling::CompileCommand Cmd;
+ Cmd.CommandLine = {"clang++", "foo.cc"};
+ Mangler->adjust(Cmd, "foo.cc");
+ EXPECT_THAT(llvm::join(Cmd.CommandLine, " "),
HasSubstr("-isysroot " + testPath("fake/sysroot")));
}
TEST(CommandMangler, ClangPath) {
auto Mangler = CommandMangler::forTests();
- Mangler.ClangPath = testPath("fake/clang");
+ Mangler->ClangPath = testPath("fake/clang");
- std::vector<std::string> Cmd = {"clang++", "foo.cc"};
- Mangler.adjust(Cmd, "foo.cc");
- EXPECT_EQ(testPath("fake/clang++"), Cmd.front());
+ tooling::CompileCommand Cmd;
+ Cmd.CommandLine = {"clang++", "foo.cc"};
+ Mangler->adjust(Cmd, "foo.cc");
+ EXPECT_EQ(testPath("fake/clang++"), Cmd.CommandLine.front());
- Cmd = {"unknown-binary", "foo.cc"};
- Mangler.adjust(Cmd, "foo.cc");
- EXPECT_EQ(testPath("fake/unknown-binary"), Cmd.front());
+ Cmd.CommandLine = {"unknown-binary", "foo.cc"};
+ Mangler->adjust(Cmd, "foo.cc");
+ EXPECT_EQ(testPath("fake/unknown-binary"), Cmd.CommandLine.front());
- Cmd = {testPath("path/clang++"), "foo.cc"};
- Mangler.adjust(Cmd, "foo.cc");
- EXPECT_EQ(testPath("path/clang++"), Cmd.front());
+ Cmd.CommandLine = {testPath("path/clang++"), "foo.cc"};
+ Mangler->adjust(Cmd, "foo.cc");
+ EXPECT_EQ(testPath("path/clang++"), Cmd.CommandLine.front());
- Cmd = {"foo/unknown-binary", "foo.cc"};
- Mangler.adjust(Cmd, "foo.cc");
- EXPECT_EQ("foo/unknown-binary", Cmd.front());
+ Cmd.CommandLine = {"foo/unknown-binary", "foo.cc"};
+ Mangler->adjust(Cmd, "foo.cc");
+ EXPECT_EQ("foo/unknown-binary", Cmd.CommandLine.front());
}
// Only run the PATH/symlink resolving test on unix, we need to fiddle
@@ -141,11 +148,12 @@
// Test the case where the driver is an absolute path to a symlink.
auto Mangler = CommandMangler::forTests();
- Mangler.ClangPath = testPath("fake/clang");
- std::vector<std::string> Cmd = {(TempDir + "/bin/foo").str(), "foo.cc"};
- Mangler.adjust(Cmd, "foo.cc");
+ Mangler->ClangPath = testPath("fake/clang");
+ tooling::CompileCommand Cmd;
+ Cmd.CommandLine = {(TempDir + "/bin/foo").str(), "foo.cc"};
+ Mangler->adjust(Cmd, "foo.cc");
// Directory based on resolved symlink, basename preserved.
- EXPECT_EQ((TempDir + "/lib/foo").str(), Cmd.front());
+ EXPECT_EQ((TempDir + "/lib/foo").str(), Cmd.CommandLine.front());
// Set PATH to point to temp/bin so we can find 'foo' on it.
ASSERT_TRUE(::getenv("PATH"));
@@ -157,23 +165,24 @@
// Test the case where the driver is a $PATH-relative path to a symlink.
Mangler = CommandMangler::forTests();
- Mangler.ClangPath = testPath("fake/clang");
+ Mangler->ClangPath = testPath("fake/clang");
// Driver found on PATH.
- Cmd = {"foo", "foo.cc"};
- Mangler.adjust(Cmd, "foo.cc");
+ Cmd.CommandLine = {"foo", "foo.cc"};
+ Mangler->adjust(Cmd, "foo.cc");
// Found the symlink and resolved the path as above.
- EXPECT_EQ((TempDir + "/lib/foo").str(), Cmd.front());
+ EXPECT_EQ((TempDir + "/lib/foo").str(), Cmd.CommandLine.front());
// Symlink not resolved with -no-canonical-prefixes.
- Cmd = {"foo", "-no-canonical-prefixes", "foo.cc"};
- Mangler.adjust(Cmd, "foo.cc");
- EXPECT_EQ((TempDir + "/bin/foo").str(), Cmd.front());
+ Cmd.CommandLine = {"foo", "-no-canonical-prefixes", "foo.cc"};
+ Mangler->adjust(Cmd, "foo.cc");
+ EXPECT_EQ((TempDir + "/bin/foo").str(), Cmd.CommandLine.front());
}
#endif
TEST(CommandMangler, ConfigEdits) {
auto Mangler = CommandMangler::forTests();
- std::vector<std::string> Cmd = {"clang++", "foo.cc"};
+ tooling::CompileCommand Cmd;
+ Cmd.CommandLine = {"clang++", "foo.cc"};
{
Config Cfg;
Cfg.CompileFlags.Edits.push_back([](std::vector<std::string> &Argv) {
@@ -185,11 +194,11 @@
Argv = tooling::getInsertArgumentAdjuster("--hello")(Argv, "");
});
WithContextValue WithConfig(Config::Key, std::move(Cfg));
- Mangler.adjust(Cmd, "foo.cc");
+ Mangler->adjust(Cmd, "foo.cc");
}
// Edits are applied in given order and before other mangling and they always
// go before filename.
- EXPECT_THAT(Cmd, ElementsAre(_, "--hello", "--", "FOO.CC"));
+ EXPECT_THAT(Cmd.CommandLine, ElementsAre(_, "--hello", "--", "FOO.CC"));
}
static std::string strip(llvm::StringRef Arg, llvm::StringRef Argv) {
@@ -363,57 +372,61 @@
TEST(CommandMangler, InputsAfterDashDash) {
const auto Mangler = CommandMangler::forTests();
{
- std::vector<std::string> Args = {"clang", "/Users/foo.cc"};
- Mangler.adjust(Args, "/Users/foo.cc");
- EXPECT_THAT(llvm::makeArrayRef(Args).take_back(2),
+ tooling::CompileCommand Cmd;
+ Cmd.CommandLine = {"clang", "/Users/foo.cc"};
+ Mangler->adjust(Cmd, "/Users/foo.cc");
+ EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).take_back(2),
ElementsAre("--", "/Users/foo.cc"));
- EXPECT_THAT(llvm::makeArrayRef(Args).drop_back(2),
+ EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).drop_back(2),
Not(Contains("/Users/foo.cc")));
}
// In CL mode /U triggers an undef operation, hence `/Users/foo.cc` shouldn't
// be interpreted as a file.
{
- std::vector<std::string> Args = {"clang", "--driver-mode=cl", "bar.cc",
- "/Users/foo.cc"};
- Mangler.adjust(Args, "bar.cc");
- EXPECT_THAT(llvm::makeArrayRef(Args).take_back(2),
+ tooling::CompileCommand Cmd;
+ Cmd.CommandLine = {"clang", "--driver-mode=cl", "bar.cc", "/Users/foo.cc"};
+ Mangler->adjust(Cmd, "bar.cc");
+ EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).take_back(2),
ElementsAre("--", "bar.cc"));
- EXPECT_THAT(llvm::makeArrayRef(Args).drop_back(2), Not(Contains("bar.cc")));
+ EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).drop_back(2),
+ Not(Contains("bar.cc")));
}
// All inputs but the main file is dropped.
{
- std::vector<std::string> Args = {"clang", "foo.cc", "bar.cc"};
- Mangler.adjust(Args, "baz.cc");
- EXPECT_THAT(llvm::makeArrayRef(Args).take_back(2),
+ tooling::CompileCommand Cmd;
+ Cmd.CommandLine = {"clang", "foo.cc", "bar.cc"};
+ Mangler->adjust(Cmd, "baz.cc");
+ EXPECT_THAT(llvm::makeArrayRef(Cmd.CommandLine).take_back(2),
ElementsAre("--", "baz.cc"));
EXPECT_THAT(
- llvm::makeArrayRef(Args).drop_back(2),
+ llvm::makeArrayRef(Cmd.CommandLine).drop_back(2),
testing::AllOf(Not(Contains("foo.cc")), Not(Contains("bar.cc"))));
}
}
TEST(CommandMangler, StripsMultipleArch) {
const auto Mangler = CommandMangler::forTests();
- std::vector<std::string> Args = {"clang", "-arch", "foo",
- "-arch", "bar", "/Users/foo.cc"};
- Mangler.adjust(Args, "/Users/foo.cc");
- EXPECT_EQ(
- llvm::count_if(Args, [](llvm::StringRef Arg) { return Arg == "-arch"; }),
- 0);
+ tooling::CompileCommand Cmd;
+ Cmd.CommandLine = {"clang", "-arch", "foo", "-arch", "bar", "/Users/foo.cc"};
+ Mangler->adjust(Cmd, "/Users/foo.cc");
+ EXPECT_EQ(llvm::count_if(Cmd.CommandLine,
+ [](llvm::StringRef Arg) { return Arg == "-arch"; }),
+ 0);
// Single arch option is preserved.
- Args = {"clang", "-arch", "foo", "/Users/foo.cc"};
- Mangler.adjust(Args, "/Users/foo.cc");
- EXPECT_EQ(
- llvm::count_if(Args, [](llvm::StringRef Arg) { return Arg == "-arch"; }),
- 1);
+ Cmd.CommandLine = {"clang", "-arch", "foo", "/Users/foo.cc"};
+ Mangler->adjust(Cmd, "/Users/foo.cc");
+ EXPECT_EQ(llvm::count_if(Cmd.CommandLine,
+ [](llvm::StringRef Arg) { return Arg == "-arch"; }),
+ 1);
}
TEST(CommandMangler, EmptyArgs) {
const auto Mangler = CommandMangler::forTests();
- std::vector<std::string> Args = {};
+ tooling::CompileCommand Cmd;
+ Cmd.CommandLine = {};
// Make sure we don't crash.
- Mangler.adjust(Args, "foo.cc");
+ Mangler->adjust(Cmd, "foo.cc");
}
} // namespace
} // namespace clangd
Index: clang-tools-extra/clangd/unittests/ClangdTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/ClangdTests.cpp
+++ clang-tools-extra/clangd/unittests/ClangdTests.cpp
@@ -350,7 +350,7 @@
Opts.ContextProvider =
ClangdServer::createConfiguredContextProvider(&CfgProvider, nullptr);
OverlayCDB CDB(/*Base=*/nullptr, /*FallbackFlags=*/{},
- tooling::ArgumentsAdjuster(CommandMangler::forTests()));
+ CommandMangler::forTests());
MockFS FS;
ClangdServer Server(CDB, FS, Opts);
// foo.cc sees the expected definition, as FOO is defined.
Index: clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
+++ clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp
@@ -146,7 +146,7 @@
MemoryShardStorage MSS(Storage, CacheHits);
// We need the CommandMangler, because that applies the config we're testing.
OverlayCDB CDB(/*Base=*/nullptr, /*FallbackFlags=*/{},
- tooling::ArgumentsAdjuster(CommandMangler::forTests()));
+ CommandMangler::forTests());
BackgroundIndex Idx(
FS, CDB, [&](llvm::StringRef) { return &MSS; }, std::move(Opts));
Index: clang-tools-extra/clangd/tool/Check.cpp
===================================================================
--- clang-tools-extra/clangd/tool/Check.cpp
+++ clang-tools-extra/clangd/tool/Check.cpp
@@ -104,10 +104,9 @@
std::move(BaseCDB));
auto Mangler = CommandMangler::detect();
if (Opts.ResourceDir)
- Mangler.ResourceDir = *Opts.ResourceDir;
+ Mangler->ResourceDir = *Opts.ResourceDir;
auto CDB = std::make_unique<OverlayCDB>(
- BaseCDB.get(), std::vector<std::string>{},
- tooling::ArgumentsAdjuster(std::move(Mangler)));
+ BaseCDB.get(), std::vector<std::string>{}, std::move(Mangler));
if (auto TrueCmd = CDB->getCompileCommand(File)) {
Cmd = std::move(*TrueCmd);
Index: clang-tools-extra/clangd/indexer/IndexerMain.cpp
===================================================================
--- clang-tools-extra/clangd/indexer/IndexerMain.cpp
+++ clang-tools-extra/clangd/indexer/IndexerMain.cpp
@@ -147,7 +147,14 @@
auto Err = Executor->get()->execute(
std::make_unique<clang::clangd::IndexActionFactory>(Data),
clang::tooling::ArgumentsAdjuster(
- clang::clangd::CommandMangler::detect()));
+ [Mangler = std::shared_ptr<clang::clangd::CommandMangler>(
+ clang::clangd::CommandMangler::detect().release())](
+ const std::vector<std::string> &Args, llvm::StringRef File) {
+ clang::tooling::CompileCommand Cmd;
+ Cmd.CommandLine = Args;
+ Mangler->adjust(Cmd, File);
+ return Cmd.CommandLine;
+ }));
if (Err) {
clang::clangd::elog("{0}", std::move(Err));
}
Index: clang-tools-extra/clangd/GlobalCompilationDatabase.h
===================================================================
--- clang-tools-extra/clangd/GlobalCompilationDatabase.h
+++ clang-tools-extra/clangd/GlobalCompilationDatabase.h
@@ -160,6 +160,16 @@
friend class DirectoryBasedGlobalCompilationDatabaseCacheTest;
};
+// Makes adjustments to a tooling::CompileCommand which will be used to
+// process a file (possibly different from the one in the command).
+class CompileCommandsAdjuster {
+public:
+ virtual ~CompileCommandsAdjuster() = default;
+
+ virtual void adjust(tooling::CompileCommand &Cmd,
+ llvm::StringRef File) const = 0;
+};
+
/// Extracts system include search path from drivers matching QueryDriverGlobs
/// and adds them to the compile flags. Base may not be nullptr.
/// Returns Base when \p QueryDriverGlobs is empty.
@@ -176,7 +186,7 @@
// Adjuster is applied to all commands, fallback or not.
OverlayCDB(const GlobalCompilationDatabase *Base,
std::vector<std::string> FallbackFlags = {},
- tooling::ArgumentsAdjuster Adjuster = nullptr);
+ std::unique_ptr<CompileCommandsAdjuster> Adjuster = nullptr);
llvm::Optional<tooling::CompileCommand>
getCompileCommand(PathRef File) const override;
@@ -190,7 +200,7 @@
private:
mutable std::mutex Mutex;
llvm::StringMap<tooling::CompileCommand> Commands; /* GUARDED_BY(Mut) */
- tooling::ArgumentsAdjuster ArgsAdjuster;
+ std::unique_ptr<CompileCommandsAdjuster> ArgsAdjuster;
std::vector<std::string> FallbackFlags;
};
Index: clang-tools-extra/clangd/GlobalCompilationDatabase.cpp
===================================================================
--- clang-tools-extra/clangd/GlobalCompilationDatabase.cpp
+++ clang-tools-extra/clangd/GlobalCompilationDatabase.cpp
@@ -740,7 +740,7 @@
OverlayCDB::OverlayCDB(const GlobalCompilationDatabase *Base,
std::vector<std::string> FallbackFlags,
- tooling::ArgumentsAdjuster Adjuster)
+ std::unique_ptr<CompileCommandsAdjuster> Adjuster)
: DelegatingCDB(Base), ArgsAdjuster(std::move(Adjuster)),
FallbackFlags(std::move(FallbackFlags)) {}
@@ -758,7 +758,7 @@
if (!Cmd)
return llvm::None;
if (ArgsAdjuster)
- Cmd->CommandLine = ArgsAdjuster(Cmd->CommandLine, File);
+ ArgsAdjuster->adjust(*Cmd, File);
return Cmd;
}
@@ -768,7 +768,7 @@
Cmd.CommandLine.insert(Cmd.CommandLine.end(), FallbackFlags.begin(),
FallbackFlags.end());
if (ArgsAdjuster)
- Cmd.CommandLine = ArgsAdjuster(Cmd.CommandLine, File);
+ ArgsAdjuster->adjust(Cmd, File);
return Cmd;
}
Index: clang-tools-extra/clangd/CompileCommands.h
===================================================================
--- clang-tools-extra/clangd/CompileCommands.h
+++ clang-tools-extra/clangd/CompileCommands.h
@@ -8,8 +8,8 @@
#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_COMPILECOMMANDS_H
#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_COMPILECOMMANDS_H
+#include "GlobalCompilationDatabase.h"
#include "support/Threading.h"
-#include "clang/Tooling/ArgumentsAdjusters.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/StringRef.h"
#include <deque>
@@ -25,7 +25,7 @@
// - forcing the use of clangd's builtin headers rather than clang's
// - resolving argv0 as cc1 expects
// - injecting -isysroot flags on mac as the system clang does
-struct CommandMangler {
+struct CommandMangler : public CompileCommandsAdjuster {
// Absolute path to clang.
llvm::Optional<std::string> ClangPath;
// Directory containing builtin headers.
@@ -35,18 +35,20 @@
// A command-mangler that doesn't know anything about the system.
// This is hermetic for unit-tests, but won't work well in production.
- static CommandMangler forTests();
+ static std::unique_ptr<CommandMangler> forTests();
// Probe the system and build a command-mangler that knows the toolchain.
// - try to find clang on $PATH, otherwise fake a path near clangd
// - find the resource directory installed near clangd
// - on mac, find clang and isysroot by querying the `xcrun` launcher
- static CommandMangler detect();
+ static std::unique_ptr<CommandMangler> detect();
- void adjust(std::vector<std::string> &Cmd, llvm::StringRef File) const;
- explicit operator clang::tooling::ArgumentsAdjuster() &&;
+ void adjust(tooling::CompileCommand &Cmd,
+ llvm::StringRef File) const override;
-private:
+ // Needs to be public so make_unique implementation can call it.
CommandMangler() = default;
+
+private:
Memoize<llvm::StringMap<std::string>> ResolvedDrivers;
Memoize<llvm::StringMap<std::string>> ResolvedDriversNoFollow;
};
Index: clang-tools-extra/clangd/CompileCommands.cpp
===================================================================
--- clang-tools-extra/clangd/CompileCommands.cpp
+++ clang-tools-extra/clangd/CompileCommands.cpp
@@ -13,7 +13,6 @@
#include "clang/Driver/Driver.h"
#include "clang/Driver/Options.h"
#include "clang/Frontend/CompilerInvocation.h"
-#include "clang/Tooling/ArgumentsAdjusters.h"
#include "clang/Tooling/CompilationDatabase.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/STLExtras.h"
@@ -185,18 +184,21 @@
} // namespace
-CommandMangler CommandMangler::detect() {
- CommandMangler Result;
- Result.ClangPath = detectClangPath();
- Result.ResourceDir = detectStandardResourceDir();
- Result.Sysroot = detectSysroot();
+std::unique_ptr<CommandMangler> CommandMangler::detect() {
+ std::unique_ptr<CommandMangler> Result = std::make_unique<CommandMangler>();
+ Result->ClangPath = detectClangPath();
+ Result->ResourceDir = detectStandardResourceDir();
+ Result->Sysroot = detectSysroot();
return Result;
}
-CommandMangler CommandMangler::forTests() { return CommandMangler(); }
+std::unique_ptr<CommandMangler> CommandMangler::forTests() {
+ return std::make_unique<CommandMangler>();
+}
-void CommandMangler::adjust(std::vector<std::string> &Cmd,
+void CommandMangler::adjust(tooling::CompileCommand &Command,
llvm::StringRef File) const {
+ std::vector<std::string> &Cmd = Command.CommandLine;
trace::Span S("AdjustCompileFlags");
// Most of the modifications below assumes the Cmd starts with a driver name.
// We might consider injecting a generic driver name like "cc" or "c++", but
@@ -337,16 +339,6 @@
}
}
-CommandMangler::operator clang::tooling::ArgumentsAdjuster() && {
- // ArgumentsAdjuster is a std::function and so must be copyable.
- return [Mangler = std::make_shared<CommandMangler>(std::move(*this))](
- const std::vector<std::string> &Args, llvm::StringRef File) {
- auto Result = Args;
- Mangler->adjust(Result, File);
- return Result;
- };
-}
-
// ArgStripper implementation
namespace {
Index: clang-tools-extra/clangd/ClangdLSPServer.cpp
===================================================================
--- clang-tools-extra/clangd/ClangdLSPServer.cpp
+++ clang-tools-extra/clangd/ClangdLSPServer.cpp
@@ -478,9 +478,9 @@
}
auto Mangler = CommandMangler::detect();
if (Opts.ResourceDir)
- Mangler.ResourceDir = *Opts.ResourceDir;
+ Mangler->ResourceDir = *Opts.ResourceDir;
CDB.emplace(BaseCDB.get(), Params.initializationOptions.fallbackFlags,
- tooling::ArgumentsAdjuster(std::move(Mangler)));
+ std::move(Mangler));
{
// Switch caller's context with LSPServer's background context. Since we
// rather want to propagate information from LSPServer's context into the
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
