Update for llvm r281167: changes to ilist_iterator template arguments.

Author: bob-wilson

include/swift/SIL/SILBasicBlock.h

@@ -327,6 +327,7 @@ public ilist_default_traits<::swift::SILBasicBlock> {
   friend class ::swift::SILFunction;
 
   SILFunction *Parent;
+  using block_iterator = simple_ilist<SILBasicBlock>::iterator;
 
 public:
 
@@ -336,8 +337,7 @@ public ilist_default_traits<::swift::SILBasicBlock> {
   }
 
   void transferNodesFromList(ilist_traits<SILBasicBlock> &SrcTraits,
-                             ilist_iterator<SILBasicBlock> First,
-                             ilist_iterator<SILBasicBlock> Last);
+                             block_iterator First, block_iterator Last);
 
 private:
   static void createNode(const SILBasicBlock &);

include/swift/SIL/SILInstruction.h

@@ -5439,6 +5439,8 @@ struct ilist_traits<::swift::SILInstruction> :
 private:
   swift::SILBasicBlock *getContainingBlock();
 
+  using instr_iterator = simple_ilist<SILInstruction>::iterator;
+
 public:
   static void deleteNode(SILInstruction *V) {
     SILInstruction::destroy(V);
@@ -5447,8 +5449,7 @@ struct ilist_traits<::swift::SILInstruction> :
   void addNodeToList(SILInstruction *I);
   void removeNodeFromList(SILInstruction *I);
   void transferNodesFromList(ilist_traits<SILInstruction> &L2,
-                             ilist_iterator<SILInstruction> first,
-                             ilist_iterator<SILInstruction> last);
+                             instr_iterator first, instr_iterator last);
 
 private:
   void createNode(const SILInstruction &);

lib/IRGen/Address.h

@@ -20,6 +20,7 @@
 #include "IRGen.h"
 #include "llvm/IR/Value.h"
 #include "llvm/IR/Argument.h"
+#include "llvm/IR/Function.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/ADT/ilist.h"
 #include "llvm/IR/DerivedTypes.h"

lib/SIL/SILBasicBlock.cpp

@@ -171,8 +171,7 @@ void SILBasicBlock::moveAfter(SILBasicBlock *After) {
 void
 llvm::ilist_traits<swift::SILBasicBlock>::
 transferNodesFromList(llvm::ilist_traits<SILBasicBlock> &SrcTraits,
-                      llvm::ilist_iterator<SILBasicBlock> First,
-                      llvm::ilist_iterator<SILBasicBlock> Last) {
+                      block_iterator First, block_iterator Last) {
   assert(&Parent->getModule() == &SrcTraits.Parent->getModule() &&
          "Module mismatch!");
 

lib/SIL/SILInstruction.cpp

@@ -79,8 +79,7 @@ void llvm::ilist_traits<SILInstruction>::removeNodeFromList(SILInstruction *I) {
 
 void llvm::ilist_traits<SILInstruction>::
 transferNodesFromList(llvm::ilist_traits<SILInstruction> &L2,
-                      llvm::ilist_iterator<SILInstruction> first,
-                      llvm::ilist_iterator<SILInstruction> last) {
+                      instr_iterator first, instr_iterator last) {
   // If transferring instructions within the same basic block, no reason to
   // update their parent pointers.
   SILBasicBlock *ThisParent = getContainingBlock();