Don't increment a dead iterator

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17904 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index d039630ddbcbb997754af7a41b75791908a0ae5e..b09730365848a30bdf1f6cb4e60ed37e18b1eedb 100644 (file)
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -404,7 +404,7 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
           GlobalsByName.find(SGV->getName());
         if (EGV != GlobalsByName.end())
           DGV = dyn_cast<GlobalVariable>(EGV->second);
-        if (DGV && RecursiveResolveTypes(SGV->getType(), DGV->getType(), ST, ""))
+        if (DGV && RecursiveResolveTypes(SGV->getType(), DGV->getType(),ST, ""))
           DGV = 0;  // FIXME: gross.
       }
 
@@ -691,8 +691,7 @@ static bool LinkFunctionBody(Function *Dest, Function *Src,
           *OI = RemapOperand(*OI, GlobalMap);
 
   // There is no need to map the arguments anymore.
-  for (Function::aiterator I = Src->abegin(), E = Src->aend();
-       I != E; ++I, ++DI)
+  for (Function::aiterator I = Src->abegin(), E = Src->aend(); I != E; ++I)
     GlobalMap.erase(I);
 
   return false;