minor cleanups
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10985 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/DataStructure/DataStructureAA.cpp b/lib/Analysis/DataStructure/DataStructureAA.cpp
index cbc13ce..8a2e0ca 100644
--- a/lib/Analysis/DataStructure/DataStructureAA.cpp
+++ b/lib/Analysis/DataStructure/DataStructureAA.cpp
@@ -166,9 +166,8 @@
// The only must alias information we can currently determine occurs when
// the node for P is a global node with only one entry.
- const DSGraph::ScalarMapTy &GSM = G->getScalarMap();
- DSGraph::ScalarMapTy::const_iterator I = GSM.find(P);
- if (I != GSM.end()) {
+ DSGraph::ScalarMapTy::const_iterator I = G->getScalarMap().find(P);
+ if (I != G->getScalarMap().end()) {
DSNode *N = I->second.getNode();
if (N->isComplete() && isSinglePhysicalObject(N))
RetVals.push_back(N->getGlobals()[0]);
diff --git a/lib/Analysis/DataStructure/Local.cpp b/lib/Analysis/DataStructure/Local.cpp
index 5cafefa..03ec741 100644
--- a/lib/Analysis/DataStructure/Local.cpp
+++ b/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);