diff --git a/llvm/lib/Target/Mips/Mips.h b/llvm/lib/Target/Mips/Mips.h index 639e189dee69..d9faf3325cac 100644 --- a/llvm/lib/Target/Mips/Mips.h +++ b/llvm/lib/Target/Mips/Mips.h @@ -31,7 +31,7 @@ namespace llvm { FunctionPass *createMipsDelaySlotFillerPass(MipsTargetMachine &TM); FunctionPass *createMipsHazardSchedule(); FunctionPass *createMipsLongBranchPass(MipsTargetMachine &TM); - FunctionPass *createMipsConstantIslandPass(MipsTargetMachine &tm); + FunctionPass *createMipsConstantIslandPass(); } // end namespace llvm; #endif diff --git a/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp b/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp index 3b8d3a2ef7d0..b58c886c7fca 100644 --- a/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp +++ b/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp @@ -332,8 +332,6 @@ namespace { /// the branch fix up pass. bool HasFarJump; - const TargetMachine &TM; - bool IsPIC; const MipsSubtarget *STI; const Mips16InstrInfo *TII; MipsFunctionInfo *MFI; @@ -354,10 +352,9 @@ namespace { public: static char ID; - MipsConstantIslands(TargetMachine &tm) - : MachineFunctionPass(ID), TM(tm), - IsPIC(TM.getRelocationModel() == Reloc::PIC_), STI(nullptr), - MF(nullptr), MCP(nullptr), PrescannedForConstants(false) {} + MipsConstantIslands() + : MachineFunctionPass(ID), STI(nullptr), MF(nullptr), MCP(nullptr), + PrescannedForConstants(false) {} const char *getPassName() const override { return "Mips Constant Islands"; @@ -432,10 +429,9 @@ void MipsConstantIslands::dumpBBs() { } }); } -/// createMipsLongBranchPass - Returns a pass that converts branches to long -/// branches. -FunctionPass *llvm::createMipsConstantIslandPass(MipsTargetMachine &tm) { - return new MipsConstantIslands(tm); +/// Returns a pass that converts branches to long branches. +FunctionPass *llvm::createMipsConstantIslandPass() { + return new MipsConstantIslands(); } bool MipsConstantIslands::runOnMachineFunction(MachineFunction &mf) { diff --git a/llvm/lib/Target/Mips/MipsTargetMachine.cpp b/llvm/lib/Target/Mips/MipsTargetMachine.cpp index 79b0b455ccd0..8366129b2052 100644 --- a/llvm/lib/Target/Mips/MipsTargetMachine.cpp +++ b/llvm/lib/Target/Mips/MipsTargetMachine.cpp @@ -270,5 +270,5 @@ void MipsPassConfig::addPreEmitPass() { addPass(createMipsDelaySlotFillerPass(TM)); addPass(createMipsHazardSchedule()); addPass(createMipsLongBranchPass(TM)); - addPass(createMipsConstantIslandPass(TM)); + addPass(createMipsConstantIslandPass()); }