diff options
| -rw-r--r-- | llvm/include/llvm/CodeGen/MachineBasicBlock.h | 6 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/MachineBasicBlock.cpp | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/llvm/include/llvm/CodeGen/MachineBasicBlock.h b/llvm/include/llvm/CodeGen/MachineBasicBlock.h index 6333f55bc21..04eba064bcf 100644 --- a/llvm/include/llvm/CodeGen/MachineBasicBlock.h +++ b/llvm/include/llvm/CodeGen/MachineBasicBlock.h @@ -46,9 +46,9 @@ private: public: void addNodeToList(MachineInstr *N); void removeNodeFromList(MachineInstr *N); - template <class Iterator> - void transferNodesFromList(ilist_traits &OldList, Iterator First, - Iterator Last); + void transferNodesFromList(ilist_traits &OldList, + simple_ilist<MachineInstr>::iterator First, + simple_ilist<MachineInstr>::iterator Last); void deleteNode(MachineInstr *MI); // Leave out createNode... diff --git a/llvm/lib/CodeGen/MachineBasicBlock.cpp b/llvm/lib/CodeGen/MachineBasicBlock.cpp index 1788d7ca952..d50f4e7763a 100644 --- a/llvm/lib/CodeGen/MachineBasicBlock.cpp +++ b/llvm/lib/CodeGen/MachineBasicBlock.cpp @@ -118,11 +118,9 @@ void ilist_traits<MachineInstr>::removeNodeFromList(MachineInstr *N) { /// When moving a range of instructions from one MBB list to another, we need to /// update the parent pointers and the use/def lists. -template <> -void ilist_traits<MachineInstr>::transferNodesFromList< - ilist<MachineInstr>::iterator>(ilist_traits<MachineInstr> &FromList, - ilist<MachineInstr>::iterator First, - ilist<MachineInstr>::iterator Last) { +void ilist_traits<MachineInstr>::transferNodesFromList( + ilist_traits &FromList, simple_ilist<MachineInstr>::iterator First, + simple_ilist<MachineInstr>::iterator Last) { assert(Parent->getParent() == FromList.Parent->getParent() && "MachineInstr parent mismatch!"); assert(this != &FromList && "Called without a real transfer..."); |
