namespace clang {
namespace tooling {
+static StringRef getDriverMode(const CommandLineArguments &Args) {
+ for (const auto &Arg : Args) {
+ StringRef ArgRef = Arg;
+ if (ArgRef.consume_front("--driver-mode=")) {
+ return ArgRef;
+ }
+ }
+ return StringRef();
+}
+
/// Add -fsyntax-only option and drop options that triggers output generation.
ArgumentsAdjuster getClangSyntaxOnlyAdjuster() {
return [](const CommandLineArguments &Args, StringRef /*unused*/) {
ArgumentsAdjuster getClangStripDependencyFileAdjuster() {
return [](const CommandLineArguments &Args, StringRef /*unused*/) {
+ auto UsingClDriver = (getDriverMode(Args) == "cl");
+
CommandLineArguments AdjustedArgs;
for (size_t i = 0, e = Args.size(); i < e; ++i) {
StringRef Arg = Args[i];
- // All dependency-file options begin with -M. These include -MM,
- // -MF, -MG, -MP, -MT, -MQ, -MD, and -MMD.
- if (!Arg.startswith("-M") && !Arg.startswith("/showIncludes") &&
- !Arg.startswith("-showIncludes")) {
- AdjustedArgs.push_back(Args[i]);
+
+ // These flags take an argument: -MX foo. Skip the next argument also.
+ if (!UsingClDriver && (Arg == "-MF" || Arg == "-MT" || Arg == "-MQ")) {
+ ++i;
continue;
}
+ // When not using the cl driver mode, dependency file generation options
+ // begin with -M. These include -MM, -MF, -MG, -MP, -MT, -MQ, -MD, and
+ // -MMD.
+ if (!UsingClDriver && Arg.startswith("-M"))
+ continue;
+ // Under MSVC's cl driver mode, dependency file generation is controlled
+ // using /showIncludes
+ if (Arg.startswith("/showIncludes") || Arg.startswith("-showIncludes"))
+ continue;
- if (Arg == "-MF" || Arg == "-MT" || Arg == "-MQ")
- // These flags take an argument: -MX foo. Skip the next argument also.
- ++i;
+ AdjustedArgs.push_back(Args[i]);
}
return AdjustedArgs;
};
EXPECT_TRUE(HasFlag("-c"));
}
+// Check getClangStripDependencyFileAdjuster doesn't strip args when using the
+// MSVC cl.exe driver
+TEST(ClangToolTest, StripDependencyFileAdjusterMsvc) {
+ FixedCompilationDatabase Compilations(
+ "/", {"--driver-mode=cl", "-MD", "-MDd", "-MT", "-O1", "-MTd", "-MP"});
+
+ ClangTool Tool(Compilations, std::vector<std::string>(1, "/a.cc"));
+ Tool.mapVirtualFile("/a.cc", "void a() {}");
+
+ std::unique_ptr<FrontendActionFactory> Action(
+ newFrontendActionFactory<SyntaxOnlyAction>());
+
+ CommandLineArguments FinalArgs;
+ ArgumentsAdjuster CheckFlagsAdjuster =
+ [&FinalArgs](const CommandLineArguments &Args, StringRef /*unused*/) {
+ FinalArgs = Args;
+ return Args;
+ };
+ Tool.clearArgumentsAdjusters();
+ Tool.appendArgumentsAdjuster(getClangStripDependencyFileAdjuster());
+ Tool.appendArgumentsAdjuster(CheckFlagsAdjuster);
+ Tool.run(Action.get());
+
+ auto HasFlag = [&FinalArgs](const std::string &Flag) {
+ return llvm::find(FinalArgs, Flag) != FinalArgs.end();
+ };
+ EXPECT_TRUE(HasFlag("-MD"));
+ EXPECT_TRUE(HasFlag("-MDd"));
+ EXPECT_TRUE(HasFlag("-MT"));
+ EXPECT_TRUE(HasFlag("-O1"));
+ EXPECT_TRUE(HasFlag("-MTd"));
+ EXPECT_TRUE(HasFlag("-MP"));
+}
+
// Check getClangStripPluginsAdjuster strips plugin related args.
TEST(ClangToolTest, StripPluginsAdjuster) {
FixedCompilationDatabase Compilations(