Revert r85346 change to control tail merging by CodeGenOpt::Level.
I'm going to redo this using the OptimizeForSize function attribute.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@85426 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/IfConversion.cpp b/lib/CodeGen/IfConversion.cpp
index be9e1f1..45f08b1 100644
--- a/lib/CodeGen/IfConversion.cpp
+++ b/lib/CodeGen/IfConversion.cpp
@@ -148,11 +148,9 @@
const TargetInstrInfo *TII;
bool MadeChange;
int FnNum;
- CodeGenOpt::Level OptLevel;
public:
static char ID;
- IfConverter(CodeGenOpt::Level OL) :
- MachineFunctionPass(&ID), FnNum(-1), OptLevel(OL) {}
+ IfConverter() : MachineFunctionPass(&ID), FnNum(-1) {}
virtual bool runOnMachineFunction(MachineFunction &MF);
virtual const char *getPassName() const { return "If Converter"; }
@@ -221,9 +219,10 @@
char IfConverter::ID = 0;
}
-FunctionPass *llvm::createIfConverterPass(CodeGenOpt::Level OptLevel) {
- return new IfConverter(OptLevel);
-}
+static RegisterPass<IfConverter>
+X("if-converter", "If Converter");
+
+FunctionPass *llvm::createIfConverterPass() { return new IfConverter(); }
bool IfConverter::runOnMachineFunction(MachineFunction &MF) {
TLI = MF.getTarget().getTargetLowering();
@@ -363,7 +362,7 @@
BBAnalysis.clear();
if (MadeChange) {
- BranchFolder BF(false, OptLevel);
+ BranchFolder BF(false);
BF.OptimizeFunction(MF, TII,
MF.getTarget().getRegisterInfo(),
getAnalysisIfAvailable<MachineModuleInfo>());