Factory methods for function passes now return type FunctionPass *.
Get rid of RegisterLLC, which can't handle FunctionPasses anyway.
llvm-svn: 7836
diff --git a/llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp b/llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp
index a666c5f..835169a 100644
--- a/llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp
+++ b/llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp
@@ -71,13 +71,10 @@
}
bool runOnFunction(Function &F);
+ virtual const char *getPassName() const { return "Instruction Selection"; }
};
}
-// Register the pass...
-static RegisterLLC<InstructionSelection>
-X("instselect", "Instruction Selection", createInstructionSelectionPass);
-
TmpInstruction::TmpInstruction(MachineCodeForInstruction& mcfi,
Value *s1, Value *s2, const std::string &name)
: Instruction(s1->getType(), Instruction::UserOp1, name)
@@ -384,6 +381,6 @@
// createInstructionSelectionPass - Public entrypoint for instruction selection
// and this file as a whole...
//
-Pass *createInstructionSelectionPass(TargetMachine &T) {
+FunctionPass *createInstructionSelectionPass(TargetMachine &T) {
return new InstructionSelection(T);
}
diff --git a/llvm/lib/Target/Sparc/PeepholeOpts.cpp b/llvm/lib/Target/Sparc/PeepholeOpts.cpp
index 73e9ec9..3912f4e 100644
--- a/llvm/lib/Target/Sparc/PeepholeOpts.cpp
+++ b/llvm/lib/Target/Sparc/PeepholeOpts.cpp
@@ -68,12 +68,6 @@
bool runOnBasicBlock(BasicBlock &BB); // apply this pass to each BB
};
-
-// Register the pass with llc only, and not opt...
-static RegisterLLC<PeepholeOpts>
-X("peephole", "Peephole Optimization", createPeepholeOptsPass);
-
-
/* Apply a list of peephole optimizations to this machine instruction
* within its local context. They are allowed to delete MI or any
* instruction before MI, but not
@@ -128,7 +122,7 @@
// createPeepholeOptsPass - Public entrypoint for peephole optimization
// and this file as a whole...
//
-Pass*
+FunctionPass*
createPeepholeOptsPass(TargetMachine &T)
{
return new PeepholeOpts(T);