Index: lib/Transforms/IPO/PartialInlining.cpp
===================================================================
--- lib/Transforms/IPO/PartialInlining.cpp
+++ lib/Transforms/IPO/PartialInlining.cpp
@@ -89,9 +89,8 @@
   BasicBlock* preReturn = newReturnBlock;
   newReturnBlock = newReturnBlock->splitBasicBlock(
                                               newReturnBlock->getFirstNonPHI());
-  BasicBlock::iterator I = preReturn->begin();
   BasicBlock::iterator Ins = newReturnBlock->begin();
-  while (I != preReturn->end()) {
+  for (BasicBlock::iterator I = preReturn->begin(); I != preReturn->end(); ++I) {
     PHINode* OldPhi = dyn_cast<PHINode>(I);
     if (!OldPhi) break;
     
@@ -103,8 +102,6 @@
     retPhi->addIncoming(OldPhi->getIncomingValueForBlock(newEntryBlock),
                         newEntryBlock);
     OldPhi->removeIncomingValue(newEntryBlock);
-    
-    ++I;
   }
   newEntryBlock->getTerminator()->replaceUsesOfWith(preReturn, newReturnBlock);
   
@@ -128,8 +125,8 @@
   InlineFunctionInfo IFI;
   
   // Inline the top-level if test into all callers.
-  std::vector<User *> Users(duplicateFunction->user_begin(),
-                            duplicateFunction->user_end());
+  std::vector<User*> Users(duplicateFunction->user_begin(),
+                           duplicateFunction->user_end());
   for (std::vector<User*>::iterator UI = Users.begin(), UE = Users.end();
        UI != UE; ++UI)
     if (CallInst *CI = dyn_cast<CallInst>(*UI))