commit 9f8aaf21bae6296668bfe5f150da5fa1b0800d05
author Duncan P. N. Exon Smith <dexonsmith@apple.com> Tue Oct 13 16:59:33 2015 +0000
committer Duncan P. N. Exon Smith <dexonsmith@apple.com> Tue Oct 13 16:59:33 2015 +0000
tree 2194322cdaca33bc746afc13248a5b24c2b2c1ab
parent c58656c7c06dd77a501f99d032a3db006e60359a

InstCombine: Remove ilist iterator implicit conversions, NFC

Stop relying on implicit conversions of ilist iterators in
LLVMInstCombine.  No functionality change intended.

llvm-svn: 250183

llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp

diff --git a/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp b/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp
index b035dd6..6c67fd3 100644
--- a/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp
@@ -246,7 +246,7 @@
 /// non-address-taken alloca.  Doing so will cause us to not promote the alloca
 /// to a register.
 static bool isSafeAndProfitableToSinkLoad(LoadInst *L) {
-  BasicBlock::iterator BBI = L, E = L->getParent()->end();
+  BasicBlock::iterator BBI = L->getIterator(), E = L->getParent()->end();
 
   for (++BBI; BBI != E; ++BBI)
     if (BBI->mayWriteToMemory())
@@ -819,7 +819,7 @@
         }
 
         // Otherwise, do an extract in the predecessor.
-        Builder->SetInsertPoint(Pred, Pred->getTerminator());
+        Builder->SetInsertPoint(Pred->getTerminator());
         Value *Res = InVal;
         if (Offset)
           Res = Builder->CreateLShr(Res, ConstantInt::get(InVal->getType(),