diff --git a/llvm/lib/Analysis/DataStructure/Local.cpp b/llvm/lib/Analysis/DataStructure/Local.cpp
index 5cafefa..03ec741 100644
--- a/llvm/lib/Analysis/DataStructure/Local.cpp
+++ b/llvm/lib/Analysis/DataStructure/Local.cpp
@@ -172,10 +172,9 @@
 
   // Remove all integral constants from the scalarmap!
   for (ScalarMapTy::iterator I = ScalarMap.begin(); I != ScalarMap.end();)
-    if (isa<ConstantIntegral>(I->first)) {
-      ScalarMapTy::iterator J = I++;
-      ScalarMap.erase(J);
-    } else
+    if (isa<ConstantIntegral>(I->first))
+      ScalarMap.erase(I++);
+    else
       ++I;
 
   markIncompleteNodes(DSGraph::MarkFormalArgs);