[llvm] r280135 - CodeGen: Fixup for r280128, since GCC isn't as permissive as Clang

[Duncan P. N. Exon Smith via llvm-commits]

Author: dexonsmith
Date: Tue Aug 30 14:11:11 2016
New Revision: 280135

URL: http://llvm.org/viewvc/llvm-project?rev=280135&view=rev
Log:
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

Modified:
    llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h
    llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp

Modified: llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h?rev=280135&r1=280134&r2=280135&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h Tue Aug 30 14:11:11 2016
@@ -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...

Modified: llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp?rev=280135&r1=280134&r2=280135&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineBasicBlock.cpp Tue Aug 30 14:11:11 2016
@@ -118,11 +118,9 @@ void ilist_traits<MachineInstr>::removeN
 
 /// 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...");