Skip to content

Commit 8a51fb2

Browse files
authored
Revert "[Clang] Add resource_dir_EQ flag to CC1Option group (#140870)" (#142509)
This reverts commit c7b8d6e. Fix check-clang CodeGenTest.TestNonAlterTest regression, see #140870 (comment)
1 parent 6a21dfa commit 8a51fb2

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

clang/include/clang/Driver/Options.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5899,7 +5899,7 @@ def resource_dir : Separate<["-"], "resource-dir">,
58995899
HelpText<"The directory which holds the compiler resource files">,
59005900
MarshallingInfoString<HeaderSearchOpts<"ResourceDir">>;
59015901
def resource_dir_EQ : Joined<["-"], "resource-dir=">, Flags<[NoXarchOption]>,
5902-
Visibility<[ClangOption, CC1Option, CLOption, DXCOption, FlangOption]>,
5902+
Visibility<[ClangOption, CLOption, DXCOption, FlangOption]>,
59035903
Alias<resource_dir>;
59045904
def rpath : Separate<["-"], "rpath">, Flags<[LinkerInput]>, Group<Link_Group>,
59055905
Visibility<[ClangOption, FlangOption]>;

clang/unittests/Tooling/ToolingTest.cpp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -771,25 +771,6 @@ TEST(ClangToolTest, BaseVirtualFileSystemUsage) {
771771
EXPECT_EQ(0, Tool.run(Action.get()));
772772
}
773773

774-
// Check -cc1 command doesn't fail.
775-
TEST(ClangToolTest, CC1Arg) {
776-
FixedCompilationDatabase Compilations("/", {"-cc1"});
777-
llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> OverlayFileSystem(
778-
new llvm::vfs::OverlayFileSystem(llvm::vfs::getRealFileSystem()));
779-
llvm::IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
780-
new llvm::vfs::InMemoryFileSystem);
781-
OverlayFileSystem->pushOverlay(InMemoryFileSystem);
782-
783-
InMemoryFileSystem->addFile(
784-
"a.cpp", 0, llvm::MemoryBuffer::getMemBuffer("int main() {}"));
785-
786-
ClangTool Tool(Compilations, std::vector<std::string>(1, "a.cpp"),
787-
std::make_shared<PCHContainerOperations>(), OverlayFileSystem);
788-
std::unique_ptr<FrontendActionFactory> Action(
789-
newFrontendActionFactory<SyntaxOnlyAction>());
790-
EXPECT_EQ(0, Tool.run(Action.get()));
791-
}
792-
793774
// Check getClangStripDependencyFileAdjuster doesn't strip args after -MD/-MMD.
794775
TEST(ClangToolTest, StripDependencyFileAdjuster) {
795776
FixedCompilationDatabase Compilations("/", {"-MD", "-c", "-MMD", "-w"});

0 commit comments

Comments
 (0)