diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp index e48568314bb..94ed3487e84 100644 --- a/lib/Analysis/DataStructure/DataStructure.cpp +++ b/lib/Analysis/DataStructure/DataStructure.cpp @@ -736,7 +736,7 @@ void DSGraph::dump() const { print(std::cerr); } /// remapLinks - Change all of the Links in the current node according to the /// specified mapping. /// -void DSNode::remapLinks(hash_map &OldNodeMap) { +void DSNode::remapLinks(DSGraph::NodeMapTy &OldNodeMap) { for (unsigned i = 0, e = Links.size(); i != e; ++i) { DSNodeHandle &H = OldNodeMap[Links[i].getNode()]; Links[i].setNode(H.getNode()); @@ -782,7 +782,7 @@ void DSGraph::cloneInto(const DSGraph &G, ScalarMapTy &OldValMap, Nodes[i]->remapLinks(OldNodeMap); // Copy the scalar map... merging all of the global nodes... - for (hash_map::const_iterator I = G.ScalarMap.begin(), + for (ScalarMapTy::const_iterator I = G.ScalarMap.begin(), E = G.ScalarMap.end(); I != E; ++I) { DSNodeHandle &H = OldValMap[I->first]; DSNodeHandle &MappedNode = OldNodeMap[I->second.getNode()]; @@ -790,7 +790,7 @@ void DSGraph::cloneInto(const DSGraph &G, ScalarMapTy &OldValMap, H.setNode(MappedNode.getNode()); if (isa(I->first)) { // Is this a global? - hash_map::iterator GVI = ScalarMap.find(I->first); + ScalarMapTy::iterator GVI = ScalarMap.find(I->first); if (GVI != ScalarMap.end()) // Is the global value in this fn already? GVI->second.mergeWith(H); else @@ -1176,8 +1176,7 @@ void DSGraph::removeDeadNodes(unsigned Flags) { std::vector > GlobalNodes; // Mark all nodes reachable by (non-global) scalar nodes as alive... - for (hash_map::iterator I = ScalarMap.begin(), - E = ScalarMap.end(); I != E; ) + for (ScalarMapTy::iterator I = ScalarMap.begin(), E = ScalarMap.end(); I !=E;) if (isa(I->first)) { // Keep track of global nodes assert(I->second.getNode() && "Null global node?"); GlobalNodes.push_back(std::make_pair(I->first, I->second.getNode())); @@ -1292,7 +1291,7 @@ void DSGraph::removeDeadNodes(unsigned Flags) { // for (unsigned i = 0, e = GlobalNodes.size(); i != e; ++i) { Value *G = GlobalNodes[i].first; - hash_map::iterator I = ScalarMap.find(G); + ScalarMapTy::iterator I = ScalarMap.find(G); assert(I != ScalarMap.end() && "Global not in scalar map anymore?"); assert(I->second.getNode() && "Global not pointing to anything?"); assert(!Alive.count(I->second.getNode()) && "Node is alive??"); @@ -1325,7 +1324,7 @@ void DSGraph::AssertGraphOK() const { for (unsigned i = 0, e = Nodes.size(); i != e; ++i) Nodes[i]->assertOK(); return; // FIXME: remove - for (hash_map::const_iterator I = ScalarMap.begin(), + for (ScalarMapTy::const_iterator I = ScalarMap.begin(), E = ScalarMap.end(); I != E; ++I) { assert(I->second.getNode() && "Null node in scalarmap!"); AssertNodeInGraph(I->second.getNode()); diff --git a/lib/Analysis/DataStructure/Local.cpp b/lib/Analysis/DataStructure/Local.cpp index 2b81d1423ce..ebac2690e70 100644 --- a/lib/Analysis/DataStructure/Local.cpp +++ b/lib/Analysis/DataStructure/Local.cpp @@ -149,10 +149,9 @@ DSGraph::DSGraph(Function &F, DSGraph *GG) : GlobalsGraph(GG) { #endif // Remove all integral constants from the scalarmap! - for (hash_map::iterator I = ScalarMap.begin(); - I != ScalarMap.end();) + for (ScalarMapTy::iterator I = ScalarMap.begin(); I != ScalarMap.end();) if (isa(I->first)) { - hash_map::iterator J = I++; + ScalarMapTy::iterator J = I++; ScalarMap.erase(J); } else ++I; @@ -190,7 +189,7 @@ DSNodeHandle GraphBuilder::getValueDest(Value &Val) { NH = getValueDest(*CE->getOperand(0)); else if (CE->getOpcode() == Instruction::GetElementPtr) { visitGetElementPtrInst(*CE); - hash_map::iterator I = ScalarMap.find(CE); + DSGraph::ScalarMapTy::iterator I = ScalarMap.find(CE); assert(I != ScalarMap.end() && "GEP didn't get processed right?"); NH = I->second; } else { diff --git a/lib/Analysis/DataStructure/Steensgaard.cpp b/lib/Analysis/DataStructure/Steensgaard.cpp index 5db619dd59e..82266578470 100644 --- a/lib/Analysis/DataStructure/Steensgaard.cpp +++ b/lib/Analysis/DataStructure/Steensgaard.cpp @@ -77,7 +77,7 @@ namespace { void Steens::ResolveFunctionCall(Function *F, const DSCallSite &Call, DSNodeHandle &RetVal) { assert(ResultGraph != 0 && "Result graph not allocated!"); - hash_map &ValMap = ResultGraph->getScalarMap(); + DSGraph::ScalarMapTy &ValMap = ResultGraph->getScalarMap(); // Handle the return value of the function... if (Call.getRetVal().getNode() && RetVal.getNode()) @@ -87,7 +87,7 @@ void Steens::ResolveFunctionCall(Function *F, const DSCallSite &Call, unsigned PtrArgIdx = 0; for (Function::aiterator AI = F->abegin(), AE = F->aend(); AI != AE && PtrArgIdx < Call.getNumPtrArgs(); ++AI) { - hash_map::iterator I = ValMap.find(AI); + DSGraph::ScalarMapTy::iterator I = ValMap.find(AI); if (I != ValMap.end()) // If its a pointer argument... I->second.mergeWith(Call.getPtrArg(PtrArgIdx++)); } @@ -129,7 +129,7 @@ bool Steens::run(Module &M) { // Incorporate the inlined Function's ScalarMap into the global // ScalarMap... DSGraph::ScalarMapTy &GVM = ResultGraph->getScalarMap(); - for (hash_map::iterator I = ValMap.begin(), + for (DSGraph::ScalarMapTy::iterator I = ValMap.begin(), E = ValMap.end(); I != E; ++I) GVM[I->first].mergeWith(I->second); @@ -202,12 +202,12 @@ AliasAnalysis::AliasResult Steens::alias(const Value *V1, unsigned V1Size, // FIXME: HANDLE Size argument! assert(ResultGraph && "Result graph has not been computed yet!"); - hash_map &GSM = ResultGraph->getScalarMap(); + DSGraph::ScalarMapTy &GSM = ResultGraph->getScalarMap(); - hash_map::iterator I = GSM.find(const_cast(V1)); + DSGraph::ScalarMapTy::iterator I = GSM.find(const_cast(V1)); if (I != GSM.end() && I->second.getNode()) { DSNodeHandle &V1H = I->second; - hash_map::iterator J=GSM.find(const_cast(V2)); + DSGraph::ScalarMapTy::iterator J=GSM.find(const_cast(V2)); if (J != GSM.end() && J->second.getNode()) { DSNodeHandle &V2H = J->second; // If the two pointers point to different data structure graph nodes, they