aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/CodeGen/MachineBasicBlock.cpp
diff options
context:
space:
mode:
authorDuncan P. N. Exon Smith <dexonsmith@apple.com>2016-08-30 19:11:11 +0000
committerDuncan P. N. Exon Smith <dexonsmith@apple.com>2016-08-30 19:11:11 +0000
commit73b8dbdd9409f6e2bff76b67c16a9ad1e8333a29 (patch)
tree272300fa0b32d8d4417b8ae1ecc58820924334b4 /llvm/lib/CodeGen/MachineBasicBlock.cpp
parentdd4ad3d2addc2bde8d0d37a1cf6bc77359a64b13 (diff)
downloadllvm-73b8dbdd9409f6e2bff76b67c16a9ad1e8333a29.zip
llvm-73b8dbdd9409f6e2bff76b67c16a9ad1e8333a29.tar.gz
llvm-73b8dbdd9409f6e2bff76b67c16a9ad1e8333a29.tar.bz2
CodeGen: Fixup for r280128, since GCC isn't as permissive as Clang
Fixes the bots, e.g.: http://lab.llvm.org:8011/builders/lldb-x86_64-ubuntu-14.04-buildserver/builds/10055 llvm-svn: 280135
Diffstat (limited to 'llvm/lib/CodeGen/MachineBasicBlock.cpp')
-rw-r--r--llvm/lib/CodeGen/MachineBasicBlock.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/llvm/lib/CodeGen/MachineBasicBlock.cpp b/llvm/lib/CodeGen/MachineBasicBlock.cpp
index 1788d7c..d50f4e7 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...");