forked from OSchip/llvm-project
[clangd] Add CompileFlags.Compiler option to override argv0
This is separate from --query-driver but can combine with it. Fixes https://github.com/clangd/clangd/issues/642 Differential Revision: https://reviews.llvm.org/D116196
This commit is contained in:
parent
f4ef79306c
commit
f2b3e25f86
|
@ -253,6 +253,16 @@ struct FragmentCompiler {
|
|||
}
|
||||
|
||||
void compile(Fragment::CompileFlagsBlock &&F) {
|
||||
if (F.Compiler)
|
||||
Out.Apply.push_back(
|
||||
[Compiler(std::move(**F.Compiler))](const Params &, Config &C) {
|
||||
C.CompileFlags.Edits.push_back(
|
||||
[Compiler](std::vector<std::string> &Args) {
|
||||
if (!Args.empty())
|
||||
Args.front() = Compiler;
|
||||
});
|
||||
});
|
||||
|
||||
if (!F.Remove.empty()) {
|
||||
auto Remove = std::make_shared<ArgStripper>();
|
||||
for (auto &A : F.Remove)
|
||||
|
|
|
@ -134,6 +134,16 @@ struct Fragment {
|
|||
///
|
||||
/// This section modifies how the compile command is constructed.
|
||||
struct CompileFlagsBlock {
|
||||
/// Override the compiler executable name to simulate.
|
||||
///
|
||||
/// The name can affect how flags are parsed (clang++ vs clang).
|
||||
/// If the executable name is in the --query-driver allowlist, then it will
|
||||
/// be invoked to extract include paths.
|
||||
///
|
||||
/// (That this simply replaces argv[0], and may mangle commands that use
|
||||
/// more complicated drivers like ccache).
|
||||
llvm::Optional<Located<std::string>> Compiler;
|
||||
|
||||
/// List of flags to append to the compile command.
|
||||
std::vector<Located<std::string>> Add;
|
||||
/// List of flags to remove from the compile command.
|
||||
|
|
|
@ -90,6 +90,10 @@ private:
|
|||
|
||||
void parse(Fragment::CompileFlagsBlock &F, Node &N) {
|
||||
DictParser Dict("CompileFlags", this);
|
||||
Dict.handle("Compiler", [&](Node &N) {
|
||||
if (auto Value = scalarValue(N, "Compiler"))
|
||||
F.Compiler = std::move(*Value);
|
||||
});
|
||||
Dict.handle("Add", [&](Node &N) {
|
||||
if (auto Values = scalarValues(N))
|
||||
F.Add = std::move(*Values);
|
||||
|
|
|
@ -121,14 +121,15 @@ TEST_F(ConfigCompileTests, Condition) {
|
|||
}
|
||||
|
||||
TEST_F(ConfigCompileTests, CompileCommands) {
|
||||
Frag.CompileFlags.Compiler.emplace("tpc.exe");
|
||||
Frag.CompileFlags.Add.emplace_back("-foo");
|
||||
Frag.CompileFlags.Remove.emplace_back("--include-directory=");
|
||||
std::vector<std::string> Argv = {"clang", "-I", "bar/", "--", "a.cc"};
|
||||
EXPECT_TRUE(compileAndApply());
|
||||
EXPECT_THAT(Conf.CompileFlags.Edits, SizeIs(2));
|
||||
EXPECT_THAT(Conf.CompileFlags.Edits, SizeIs(3));
|
||||
for (auto &Edit : Conf.CompileFlags.Edits)
|
||||
Edit(Argv);
|
||||
EXPECT_THAT(Argv, ElementsAre("clang", "-foo", "--", "a.cc"));
|
||||
EXPECT_THAT(Argv, ElementsAre("tpc.exe", "-foo", "--", "a.cc"));
|
||||
}
|
||||
|
||||
TEST_F(ConfigCompileTests, CompilationDatabase) {
|
||||
|
|
Loading…
Reference in New Issue