From 73b8dbdd9409f6e2bff76b67c16a9ad1e8333a29 Mon Sep 17 00:00:00 2001
From: "Duncan P. N. Exon Smith" <dexonsmith@apple.com>
Date: Tue, 30 Aug 2016 19:11:11 +0000
Subject: [PATCH] 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
---
 llvm/include/llvm/CodeGen/MachineBasicBlock.h | 6 +++---
 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 6333f55bc210..04eba064bcff 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 1788d7ca952d..d50f4e7763a5 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...");