shivanshu3 updated this revision to Diff 289606.
shivanshu3 added a comment.
- Simplified the implementation of `getDriverMode` and got rid of the
`Optional` return type.
- When using the cl driver mode, we do not want to skip the next argument for
-MF, -MT, -MQ.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D86999/new/
https://reviews.llvm.org/D86999
Files:
clang/lib/Tooling/ArgumentsAdjusters.cpp
clang/unittests/Tooling/ToolingTest.cpp
Index: clang/unittests/Tooling/ToolingTest.cpp
===================================================================
--- clang/unittests/Tooling/ToolingTest.cpp
+++ clang/unittests/Tooling/ToolingTest.cpp
@@ -563,6 +563,39 @@
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", "-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("-MTd"));
+ EXPECT_TRUE(HasFlag("-MP"));
+}
+
// Check getClangStripPluginsAdjuster strips plugin related args.
TEST(ClangToolTest, StripPluginsAdjuster) {
FixedCompilationDatabase Compilations(
Index: clang/lib/Tooling/ArgumentsAdjusters.cpp
===================================================================
--- clang/lib/Tooling/ArgumentsAdjusters.cpp
+++ clang/lib/Tooling/ArgumentsAdjusters.cpp
@@ -21,6 +21,16 @@
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*/) {
@@ -93,20 +103,33 @@
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]);
- continue;
- }
- if (Arg == "-MF" || Arg == "-MT" || Arg == "-MQ")
+ bool IsDependencyFileArg;
+ // Under MSVC's cl driver mode, dependency file generation is controlled
+ // using /showIncludes
+ if (Arg.startswith("/showIncludes") || Arg.startswith("-showIncludes"))
+ IsDependencyFileArg = true;
+ else if (UsingClDriver)
+ IsDependencyFileArg = false;
+ // 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.
+ else if (Arg.startswith("-M"))
+ IsDependencyFileArg = true;
+ else
+ IsDependencyFileArg = false;
+
+ if (!IsDependencyFileArg) {
+ AdjustedArgs.push_back(Args[i]);
+ } else if ((Arg == "-MF" || Arg == "-MT" || Arg == "-MQ")) {
// These flags take an argument: -MX foo. Skip the next argument also.
++i;
+ }
}
return AdjustedArgs;
};
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
