3 files changed, 10 insertions, 9 deletions
diff --git a/include/llvm/CodeGen/MachineFunction.h b/include/llvm/CodeGen/MachineFunction.h
index db6c1ca378..4adb48c4aa 100644
--- a/include/llvm/CodeGen/MachineFunction.h
+++ b/include/llvm/CodeGen/MachineFunction.h
@@ -17,15 +17,15 @@
 
 class Function;
 class TargetMachine;
-class Pass;
+class FunctionPass;
 class SSARegMap;
 class MachineFunctionInfo;
 class MachineFrameInfo;
 class MachineConstantPool;
 
-Pass *createMachineCodeConstructionPass(TargetMachine &TM);
-Pass *createMachineCodeDestructionPass();
-Pass *createMachineFunctionPrinterPass();
+FunctionPass *createMachineCodeConstructionPass(TargetMachine &TM);
+FunctionPass *createMachineCodeDestructionPass();
+FunctionPass *createMachineFunctionPrinterPass();
 
 class MachineFunction : private Annotation {
   const Function *Fn;
diff --git a/include/llvm/CodeGen/Passes.h b/include/llvm/CodeGen/Passes.h
index 9057fd0268..00dbfe29c8 100644
--- a/include/llvm/CodeGen/Passes.h
+++ b/include/llvm/CodeGen/Passes.h
@@ -8,7 +8,7 @@
 #ifndef LLVM_CODEGEN_PASSES_H
 #define LLVM_CODEGEN_PASSES_H
 
-class Pass;
+class FunctionPass;
 class PassInfo;
 
 // PHIElimination pass - This pass eliminates machine instruction PHI nodes by
@@ -22,17 +22,17 @@ extern const PassInfo *PHIEliminationID;
 /// from SSA form to use explicit registers by spilling every register.  Wow,
 /// great policy huh?
 ///
-Pass *createSimpleRegisterAllocator();
+FunctionPass *createSimpleRegisterAllocator();
 
 /// LocalRegisterAllocation Pass - This pass register allocates the input code a
 /// basic block at a time, yielding code better than the simple register
 /// allocator, but not as good as a global allocator.
 /// 
-Pass *createLocalRegisterAllocator();
+FunctionPass *createLocalRegisterAllocator();
 
 /// PrologEpilogCodeInserter Pass - This pass inserts prolog and epilog code,
 /// and eliminates abstract frame references.
 ///
-Pass *createPrologEpilogCodeInserter();
+FunctionPass *createPrologEpilogCodeInserter();
 
 #endif
diff --git a/include/llvm/Transforms/Scalar.h b/include/llvm/Transforms/Scalar.h
index 8a29079835..2ee3c46cba 100644
--- a/include/llvm/Transforms/Scalar.h
+++ b/include/llvm/Transforms/Scalar.h
@@ -9,6 +9,7 @@
 #define LLVM_TRANSFORMS_SCALAR_H
 
 class Pass;
+class FunctionPass;
 class GetElementPtrInst;
 class PassInfo;
 class TerminatorInst;
@@ -244,7 +245,7 @@ Pass *createRaiseAllocationsPass();
 // This pass converts SwitchInst instructions into a sequence of chained binary
 // branch instructions.
 //
-Pass *createLowerSwitchPass();
+FunctionPass *createLowerSwitchPass();
 
 //===----------------------------------------------------------------------===//
 //