From ae3db7c88ea74c881c24fd1a309db1bde242b9ba Mon Sep 17 00:00:00 2001
From: Bob Wilson <bob.wilson@apple.com>
Date: Sun, 9 Oct 2016 15:27:04 -0700
Subject: [PATCH] Update for llvm r281167: changes to ilist_iterator template
 arguments.

(cherry picked from commit 97e415ce2a64cd5d3c58f6b80e6e5417254a2b5a)
---
 include/swift/SIL/SILBasicBlock.h  | 4 ++--
 include/swift/SIL/SILInstruction.h | 5 +++--
 lib/IRGen/Address.h                | 1 +
 lib/SIL/SILBasicBlock.cpp          | 3 +--
 lib/SIL/SILInstruction.cpp         | 3 +--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/swift/SIL/SILBasicBlock.h b/include/swift/SIL/SILBasicBlock.h
index c5f2a81e9f4..0d5e617efd7 100644
--- a/include/swift/SIL/SILBasicBlock.h
+++ b/include/swift/SIL/SILBasicBlock.h
@@ -333,6 +333,7 @@ private:
   friend class ::swift::SILFunction;
 
   SILFunction *Parent;
+  using block_iterator = simple_ilist<SILBasicBlock>::iterator;
 
 public:
   static void deleteNode(SILBasicBlock *BB) { BB->~SILBasicBlock(); }
@@ -340,8 +341,7 @@ public:
   void addNodeToList(SILBasicBlock *BB) {}
 
   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 &);
diff --git a/include/swift/SIL/SILInstruction.h b/include/swift/SIL/SILInstruction.h
index b288a31bb13..afd7c4744ba 100644
--- a/include/swift/SIL/SILInstruction.h
+++ b/include/swift/SIL/SILInstruction.h
@@ -5537,6 +5537,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);
@@ -5545,8 +5547,7 @@ public:
   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 &);
diff --git a/lib/IRGen/Address.h b/lib/IRGen/Address.h
index 09cbb35e630..4c3c25ccb8c 100644
--- a/lib/IRGen/Address.h
+++ b/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"
diff --git a/lib/SIL/SILBasicBlock.cpp b/lib/SIL/SILBasicBlock.cpp
index 012309aaa36..11cdc33b594 100644
--- a/lib/SIL/SILBasicBlock.cpp
+++ b/lib/SIL/SILBasicBlock.cpp
@@ -170,8 +170,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!");
 
diff --git a/lib/SIL/SILInstruction.cpp b/lib/SIL/SILInstruction.cpp
index 461b39158c9..cab5762e236 100644
--- a/lib/SIL/SILInstruction.cpp
+++ b/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();