Skip to content

feat: drop msvc emulation mode #1004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 11 commits into
base: develop
Choose a base branch
from
+58 −31
Draft

feat: drop msvc emulation mode #1004

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
79ca5c3
avoid msvc emulation
K-ballo Sep 10, 2025
e74ba9a
skip some msvc args
K-ballo Sep 10, 2025
78c64d0
translate args
K-ballo Sep 10, 2025
6a46890
tweak
K-ballo Sep 10, 2025
d8b9068
ignore more msvc options
K-ballo Sep 10, 2025
2483cc6
more...
K-ballo Sep 10, 2025
8fbf4e3
fix unused
K-ballo Sep 10, 2025
99f9e47
Translate clang-cl /std: into clang -std=
K-ballo Sep 10, 2025
75aa4a2
typo
K-ballo Sep 10, 2025
2f75ea2
tweaks
K-ballo Sep 11, 2025
92ae4ff
ignore some more
K-ballo Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 58 additions & 31 deletions src/lib/MrDocsCompilationDatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,15 @@ isValidMrDocsOption(
driver::options::OPT_clang_ignored_gcc_optimization_f_Group,
driver::options::OPT_clang_ignored_legacy_options_Group,
driver::options::OPT_clang_ignored_m_Group,
driver::options::OPT_flang_ignored_w_Group
#if 0
driver::options::OPT_flang_ignored_w_Group,
driver::options::OPT__SLASH_O,
driver::options::OPT__SLASH_EH,
driver::options::OPT__SLASH_GR,
driver::options::OPT__SLASH_GR_,
driver::options::OPT__SLASH_M_Group,

// input file options
driver::options::OPT_INPUT,
//driver::options::OPT_INPUT,

// output file options
driver::options::OPT_o,
Expand All @@ -219,11 +224,10 @@ isValidMrDocsOption(
driver::options::OPT__SLASH_Fr,
driver::options::OPT__SLASH_Fm,
driver::options::OPT__SLASH_Fx,
#endif
// driver::options::OPT__SLASH_TP
// driver::options::OPT__SLASH_Tp
// driver::options::OPT__SLASH_TC
// driver::options::OPT__SLASH_Tc
driver::options::OPT__SLASH_TP,
driver::options::OPT__SLASH_Tp,
driver::options::OPT__SLASH_TC,
driver::options::OPT__SLASH_Tc
))
{
return false;
Expand Down Expand Up @@ -270,7 +274,7 @@ adjustCommandLine(
// Copy the compiler path
// ------------------------------------------------------
std::string const& progName = cmdline.front();
std::vector new_cmdline = {progName};
std::vector new_cmdline = {std::string{"clang"}};

// ------------------------------------------------------
// Convert to InputArgList
Expand All @@ -282,24 +286,12 @@ adjustCommandLine(
cmdLineCStrs.data(),
cmdLineCStrs.data() + cmdLineCStrs.size());

// ------------------------------------------------------
// Get driver mode
// ------------------------------------------------------
// The driver mode distinguishes between clang/gcc and msvc
// command line option formats. The value is deduced from
// the `-drive-mode` option or from `progName`.
// Common values are "gcc", "g++", "cpp", "cl" and "flang".
StringRef const driver_mode = driver::getDriverMode(progName, cmdLineCStrs);
// Identify if we should use "msvc/clang-cl" or "clang/gcc" format
// for options.
bool const is_clang_cl = driver::IsClangCL(driver_mode);

// ------------------------------------------------------
// Supress all warnings
// ------------------------------------------------------
// Add flags to ignore all warnings. Any options that
// affect warnings will be discarded later.
new_cmdline.emplace_back(is_clang_cl ? "/w" : "-w");
new_cmdline.emplace_back("-w");
new_cmdline.emplace_back("-fsyntax-only");

// ------------------------------------------------------
Expand Down Expand Up @@ -393,9 +385,10 @@ adjustCommandLine(
isExplicitCCompileCommand || (!isExplicitCppCompileCommand && isImplicitCSourceFile);

constexpr auto is_std_option = [](std::string_view const opt) {
return opt.starts_with("-std=") || opt.starts_with("--std=") || opt.starts_with("/std:");
return opt.starts_with("-std=") || opt.starts_with("--std=") ||
opt.starts_with("/std:") || opt.starts_with("-std:");
};
if (std::ranges::find_if(cmdline, is_std_option) == cmdline.end())
if (std::ranges::none_of(cmdline, is_std_option))
{
if (!isCCompileCommand)
{
Expand Down Expand Up @@ -431,7 +424,7 @@ adjustCommandLine(
for (auto const& inc : it->second)
{
new_cmdline.emplace_back(std::format("-isystem{}", inc));
}
}
}
}

Expand Down Expand Up @@ -474,6 +467,18 @@ adjustCommandLine(
new_cmdline.emplace_back(std::format("-I{}", inc));
}

// ------------------------------------------------------
// Get driver mode
// ------------------------------------------------------
// The driver mode distinguishes between clang/gcc and msvc
// command line option formats. The value is deduced from
// the `-drive-mode` option or from `progName`.
// Common values are "gcc", "g++", "cpp", "cl" and "flang".
StringRef const driver_mode = driver::getDriverMode(progName, cmdLineCStrs);
// Identify if we should use "msvc/clang-cl" or "clang/gcc" format
// for options.
bool const is_clang_cl = driver::IsClangCL(driver_mode);

// ------------------------------------------------------
// Adjust each argument in the command line
// ------------------------------------------------------
Expand All @@ -489,18 +494,40 @@ adjustCommandLine(
while (idx < cmdline.size())
{
// Parse one argument as a Clang option
// ParseOneArg updates Index to the next argument to be parsed.
unsigned const idx0 = idx;
std::unique_ptr<llvm::opt::Arg> arg =
opts_table.ParseOneArg(args, idx, visibility);
if (!isValidMrDocsOption(workingDir, arg))
{
continue;
}
new_cmdline.insert(
new_cmdline.end(),
cmdline.begin() + idx0,
cmdline.begin() + idx);

// Translate clang-cl /std: into clang -std=
const llvm::opt::Option opt =
arg->getOption().getUnaliasedOption();
if (opt.matches(clang::driver::options::OPT__SLASH_std))
{
MRDOCS_ASSERT(arg->getNumValues() == 1);

std::string_view v = arg->getValue();
if (v == "c++latest" || v == "c++23preview")
{
new_cmdline.emplace_back("-std=c++23");
}
else // c++14,c++17,c++20,c11,c17
{
new_cmdline.emplace_back(std::format("-std={}", v));
}
continue;
}

// Append the translated arguments to the new command line
llvm::opt::ArgStringList output;
arg->render(args, output);

for (auto const& v : output)
{
new_cmdline.emplace_back(v);
}
}

return new_cmdline;
Expand Down
Loading