jryans updated this revision to Diff 547159. jryans added a comment. - Fixed formatting - Rebased
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D157011/new/ https://reviews.llvm.org/D157011 Files: clang/lib/Tooling/Tooling.cpp clang/unittests/Tooling/ToolingTest.cpp Index: clang/unittests/Tooling/ToolingTest.cpp =================================================================== --- clang/unittests/Tooling/ToolingTest.cpp +++ clang/unittests/Tooling/ToolingTest.cpp @@ -449,6 +449,13 @@ EXPECT_NE(extractCC1Arguments(Args), nullptr); } +TEST_F(CommandLineExtractorTest, AcceptPreprocessedInputFile) { + addFile("test.i", "int main() {}\n"); + const char *Args[] = {"clang", "-target", "arm64-apple-macosx11.0.0", "-c", + "test.i"}; + EXPECT_NE(extractCC1Arguments(Args), nullptr); +} + TEST_F(CommandLineExtractorTest, RejectMultipleArchitectures) { addFile("test.c", "int main() {}\n"); const char *Args[] = {"clang", "-target", "arm64-apple-macosx11.0.0", Index: clang/lib/Tooling/Tooling.cpp =================================================================== --- clang/lib/Tooling/Tooling.cpp +++ clang/lib/Tooling/Tooling.cpp @@ -147,6 +147,13 @@ if (IsCC1Command(Job) && llvm::all_of(Job.getInputInfos(), IsSrcFile)) CC1Jobs.push_back(&Job); + // If there are no jobs for source files, try checking again for a single job + // with any file type. This accepts a preprocessed file as input. + if (CC1Jobs.empty()) + for (const driver::Command &Job : Jobs) + if (IsCC1Command(Job)) + CC1Jobs.push_back(&Job); + if (CC1Jobs.empty() || (CC1Jobs.size() > 1 && !ignoreExtraCC1Commands(Compilation))) { SmallString<256> error_msg;
Index: clang/unittests/Tooling/ToolingTest.cpp =================================================================== --- clang/unittests/Tooling/ToolingTest.cpp +++ clang/unittests/Tooling/ToolingTest.cpp @@ -449,6 +449,13 @@ EXPECT_NE(extractCC1Arguments(Args), nullptr); } +TEST_F(CommandLineExtractorTest, AcceptPreprocessedInputFile) { + addFile("test.i", "int main() {}\n"); + const char *Args[] = {"clang", "-target", "arm64-apple-macosx11.0.0", "-c", + "test.i"}; + EXPECT_NE(extractCC1Arguments(Args), nullptr); +} + TEST_F(CommandLineExtractorTest, RejectMultipleArchitectures) { addFile("test.c", "int main() {}\n"); const char *Args[] = {"clang", "-target", "arm64-apple-macosx11.0.0", Index: clang/lib/Tooling/Tooling.cpp =================================================================== --- clang/lib/Tooling/Tooling.cpp +++ clang/lib/Tooling/Tooling.cpp @@ -147,6 +147,13 @@ if (IsCC1Command(Job) && llvm::all_of(Job.getInputInfos(), IsSrcFile)) CC1Jobs.push_back(&Job); + // If there are no jobs for source files, try checking again for a single job + // with any file type. This accepts a preprocessed file as input. + if (CC1Jobs.empty()) + for (const driver::Command &Job : Jobs) + if (IsCC1Command(Job)) + CC1Jobs.push_back(&Job); + if (CC1Jobs.empty() || (CC1Jobs.size() > 1 && !ignoreExtraCC1Commands(Compilation))) { SmallString<256> error_msg;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits