diff options
| -rw-r--r-- | include/llvm/CodeGen/SelectionDAGISel.h | 3 | ||||
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/include/llvm/CodeGen/SelectionDAGISel.h b/include/llvm/CodeGen/SelectionDAGISel.h index 0d5fbec056..e6c10e62a7 100644 --- a/include/llvm/CodeGen/SelectionDAGISel.h +++ b/include/llvm/CodeGen/SelectionDAGISel.h @@ -279,8 +279,7 @@ private: const SDValue *Ops, unsigned NumOps, unsigned EmitNodeInfo); void PrepareEHLandingPad(MachineBasicBlock *BB); - void SelectAllBasicBlocks(Function &Fn, MachineFunction &MF, - const TargetInstrInfo &TII); + void SelectAllBasicBlocks(Function &Fn); void FinishBasicBlock(); void SelectBasicBlock(BasicBlock *LLVMBB, diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index 4321236c44..b6a56b68e0 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -210,7 +210,7 @@ bool SelectionDAGISel::runOnMachineFunction(MachineFunction &mf) { FuncInfo->set(Fn, *MF, EnableFastISel); SDB->init(GFI, *AA); - SelectAllBasicBlocks(Fn, *MF, TII); + SelectAllBasicBlocks(Fn); // Release function-specific state. SDB and CurDAG are already cleared // at this point. @@ -744,13 +744,11 @@ void SelectionDAGISel::PrepareEHLandingPad(MachineBasicBlock *BB) { } } -void SelectionDAGISel::SelectAllBasicBlocks(Function &Fn, - MachineFunction &MF, - const TargetInstrInfo &TII) { +void SelectionDAGISel::SelectAllBasicBlocks(Function &Fn) { // Initialize the Fast-ISel state, if needed. FastISel *FastIS = 0; if (EnableFastISel) - FastIS = TLI.createFastISel(MF, FuncInfo->ValueMap, FuncInfo->MBBMap, + FastIS = TLI.createFastISel(*MF, FuncInfo->ValueMap, FuncInfo->MBBMap, FuncInfo->StaticAllocaMap #ifndef NDEBUG , FuncInfo->CatchInfoLost @@ -817,7 +815,7 @@ void SelectionDAGISel::SelectAllBasicBlocks(Function &Fn, break; } - SetDebugLoc(BI, SDB, FastIS, &MF); + SetDebugLoc(BI, SDB, FastIS, MF); // Try to select the instruction with FastISel. if (FastIS->SelectInstruction(BI)) { |