aboutsummaryrefslogtreecommitdiff
path: root/clang/unittests/Frontend/CompilerInvocationTest.cpp
diff options
context:
space:
mode:
authorNikita Popov <npopov@redhat.com>2022-04-05 15:05:46 +0200
committerNikita Popov <npopov@redhat.com>2022-04-06 09:52:21 +0200
commited4e6e03981a37d54c4ac635b2bdb2c2fe8fec92 (patch)
treefea672749e6b62c41a16a3c21fd134b83f21b9fe /clang/unittests/Frontend/CompilerInvocationTest.cpp
parentb0e2ffe151c34cae87e41f8f6a58207506796fee (diff)
downloadllvm-ed4e6e03981a37d54c4ac635b2bdb2c2fe8fec92.zip
llvm-ed4e6e03981a37d54c4ac635b2bdb2c2fe8fec92.tar.gz
llvm-ed4e6e03981a37d54c4ac635b2bdb2c2fe8fec92.tar.bz2
[cmake] Remove LLVM_ENABLE_NEW_PASS_MANAGER cmake option
Or rather, error out if it is set to something other than ON. This removes the ability to enable the legacy pass manager by default, but does not remove the ability to explicitly enable it through various flags like -flegacy-pass-manager or -enable-new-pm=0. I checked, and our test suite definitely doesn't pass with LLVM_ENABLE_NEW_PASS_MANAGER=OFF anymore. Differential Revision: https://reviews.llvm.org/D123126
Diffstat (limited to 'clang/unittests/Frontend/CompilerInvocationTest.cpp')
-rw-r--r--clang/unittests/Frontend/CompilerInvocationTest.cpp33
1 files changed, 11 insertions, 22 deletions
diff --git a/clang/unittests/Frontend/CompilerInvocationTest.cpp b/clang/unittests/Frontend/CompilerInvocationTest.cpp
index 692d04a..d7f5af8 100644
--- a/clang/unittests/Frontend/CompilerInvocationTest.cpp
+++ b/clang/unittests/Frontend/CompilerInvocationTest.cpp
@@ -259,49 +259,38 @@ TEST_F(CommandLineTest, BoolOptionDefaultFalsePresentNegReset) {
// The flag with positive spelling can set the keypath to true.
// The flag with negative spelling can set the keypath to false.
-static constexpr unsigned PassManagerDefault =
- !static_cast<unsigned>(LLVM_ENABLE_NEW_PASS_MANAGER);
-
-static constexpr const char *PassManagerResetByFlag =
- LLVM_ENABLE_NEW_PASS_MANAGER ? "-fno-legacy-pass-manager"
- : "-flegacy-pass-manager";
-
-static constexpr const char *PassManagerChangedByFlag =
- LLVM_ENABLE_NEW_PASS_MANAGER ? "-flegacy-pass-manager"
- : "-fno-legacy-pass-manager";
-
TEST_F(CommandLineTest, BoolOptionDefaultArbitraryTwoFlagsPresentNone) {
const char *Args = {""};
ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
- ASSERT_EQ(Invocation.getCodeGenOpts().LegacyPassManager, PassManagerDefault);
+ ASSERT_EQ(Invocation.getCodeGenOpts().LegacyPassManager, false);
Invocation.generateCC1CommandLine(GeneratedArgs, *this);
- ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq(PassManagerResetByFlag))));
- ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq(PassManagerChangedByFlag))));
+ ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fno-legacy-pass-manager"))));
+ ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-flegacy-pass-manager"))));
}
TEST_F(CommandLineTest, BoolOptionDefaultArbitraryTwoFlagsPresentChange) {
- const char *Args[] = {PassManagerChangedByFlag};
+ const char *Args[] = {"-flegacy-pass-manager"};
ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
- ASSERT_EQ(Invocation.getCodeGenOpts().LegacyPassManager, !PassManagerDefault);
+ ASSERT_EQ(Invocation.getCodeGenOpts().LegacyPassManager, true);
Invocation.generateCC1CommandLine(GeneratedArgs, *this);
- ASSERT_THAT(GeneratedArgs, Contains(StrEq(PassManagerChangedByFlag)));
- ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq(PassManagerResetByFlag))));
+ ASSERT_THAT(GeneratedArgs, Contains(StrEq("-flegacy-pass-manager")));
+ ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fno-legacy-pass-manager"))));
}
TEST_F(CommandLineTest, BoolOptionDefaultArbitraryTwoFlagsPresentReset) {
- const char *Args[] = {PassManagerResetByFlag};
+ const char *Args[] = {"-fno-legacy-pass-manager"};
ASSERT_TRUE(CompilerInvocation::CreateFromArgs(Invocation, Args, *Diags));
- ASSERT_EQ(Invocation.getCodeGenOpts().LegacyPassManager, PassManagerDefault);
+ ASSERT_EQ(Invocation.getCodeGenOpts().LegacyPassManager, false);
Invocation.generateCC1CommandLine(GeneratedArgs, *this);
- ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq(PassManagerResetByFlag))));
- ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq(PassManagerChangedByFlag))));
+ ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-fno-legacy-pass-manager"))));
+ ASSERT_THAT(GeneratedArgs, Not(Contains(StrEq("-flegacy-pass-manager"))));
}
// Boolean option that gets the CC1Option flag from a let statement (which