[Clang] Add resource_dir_EQ flag to CC1Option group #140870
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This PR fixes ClangTool error in -cc1 mode: error: unknown argument: '-resource-dir=
|
@llvm/pr-subscribers-clang Author: Wenju He (wenju-he) ChangesThis PR fixes ClangTool error in -cc1 mode: Full diff: https://github.com/llvm/llvm-project/pull/140870.diff 2 Files Affected:
diff --git a/clang/lib/Tooling/Tooling.cpp b/clang/lib/Tooling/Tooling.cpp
index 3c72f52040142..87a984672662b 100644
--- a/clang/lib/Tooling/Tooling.cpp
+++ b/clang/lib/Tooling/Tooling.cpp
@@ -510,9 +510,11 @@ static void injectResourceDir(CommandLineArguments &Args, const char *Argv0,
return;
// If there's no override in place add our resource dir.
- Args = getInsertArgumentAdjuster(
- ("-resource-dir=" + CompilerInvocation::GetResourcesPath(Argv0, MainAddr))
- .c_str())(Args, "");
+ CommandLineArguments Extra = {
+ "-resource-dir", CompilerInvocation::GetResourcesPath(Argv0, MainAddr)};
+
+ Args =
+ getInsertArgumentAdjuster(Extra, ArgumentInsertPosition::END)(Args, "");
}
int ClangTool::run(ToolAction *Action) {
diff --git a/clang/unittests/Tooling/ToolingTest.cpp b/clang/unittests/Tooling/ToolingTest.cpp
index 8cdfffb54390e..07104ccf9835f 100644
--- a/clang/unittests/Tooling/ToolingTest.cpp
+++ b/clang/unittests/Tooling/ToolingTest.cpp
@@ -771,6 +771,25 @@ TEST(ClangToolTest, BaseVirtualFileSystemUsage) {
EXPECT_EQ(0, Tool.run(Action.get()));
}
+// Check -cc1 command doesn't crash.
+TEST(ClangToolTest, CC1Arg) {
+ FixedCompilationDatabase Compilations("/", {"-cc1"});
+ llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> OverlayFileSystem(
+ new llvm::vfs::OverlayFileSystem(llvm::vfs::getRealFileSystem()));
+ llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
+ new llvm::vfs::InMemoryFileSystem);
+ OverlayFileSystem->pushOverlay(InMemoryFileSystem);
+
+ InMemoryFileSystem->addFile(
+ "a.cpp", 0, llvm::MemoryBuffer::getMemBuffer("int main() {}"));
+
+ ClangTool Tool(Compilations, std::vector<std::string>(1, "a.cpp"),
+ std::make_shared<PCHContainerOperations>(), OverlayFileSystem);
+ std::unique_ptr<FrontendActionFactory> Action(
+ newFrontendActionFactory<SyntaxOnlyAction>());
+ EXPECT_EQ(0, Tool.run(Action.get()));
+}
+
// Check getClangStripDependencyFileAdjuster doesn't strip args after -MD/-MMD.
TEST(ClangToolTest, StripDependencyFileAdjuster) {
FixedCompilationDatabase Compilations("/", {"-MD", "-c", "-MMD", "-w"});
|
kadircet
requested changes
May 26, 2025
There was a problem hiding this comment.
do we know why https://github.com/llvm/llvm-project/blob/main/clang/include/clang/Driver/Options.td#L5894-L5901 doesn't declare _EQ version for cc1?
i think instead of working around this in various places, we should unify the two if possible.
wenju-he
changed the title
Git history shows the earliest commit f3e624c already have the difference. I don't see obvious reason why resource_dir_EQ should not be cc1 option.
done, thanks for the suggestion. |
|
LGTM, but cc @llvm/clang-area-team, in case they have any concerns here |
rnk
approved these changes
May 27, 2025
|
I bisected a crash that I see when running |
thanks @nathanchance for the bisecting. |
sivan-shani
pushed a commit
to sivan-shani/llvm-project
that referenced
this pull request
Jun 3, 2025
This PR fixes ClangTool error in -cc1 mode in function injectResourceDir: error: unknown argument: '-resource-dir=
wenju-he
added a commit
that referenced
this pull request
Jun 7, 2025
#142509) This reverts commit c7b8d6e. Fix check-clang CodeGenTest.TestNonAlterTest regression, see #140870 (comment)
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Jun 7, 2025
…p (#140870)" (#142509) This reverts commit c7b8d6e. Fix check-clang CodeGenTest.TestNonAlterTest regression, see llvm/llvm-project#140870 (comment)
rorth
pushed a commit
to rorth/llvm-project
that referenced
this pull request
Jun 11, 2025
)" (llvm#142509) This reverts commit c7b8d6e. Fix check-clang CodeGenTest.TestNonAlterTest regression, see llvm#140870 (comment)
DhruvSrivastavaX
pushed a commit
to DhruvSrivastavaX/lldb-for-aix
that referenced
this pull request
Jun 12, 2025
)" (llvm#142509) This reverts commit c7b8d6e. Fix check-clang CodeGenTest.TestNonAlterTest regression, see llvm#140870 (comment)
tomtor
pushed a commit
to tomtor/llvm-project
that referenced
this pull request
Jun 14, 2025
)" (llvm#142509) This reverts commit c7b8d6e. Fix check-clang CodeGenTest.TestNonAlterTest regression, see llvm#140870 (comment)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes ClangTool error in -cc1 mode in function injectResourceDir:
error: unknown argument: '-resource-dir=