From 3c920fa861543355b656446214fa0c4edb06448a Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 22 Mar 2005 00:21:05 +0000 Subject: [PATCH] remove the second argument to cloneInto git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@20754 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/DataStructure/BottomUpClosure.cpp | 6 ++---- lib/Analysis/DataStructure/CompleteBottomUp.cpp | 2 +- lib/Analysis/DataStructure/DataStructure.cpp | 13 +++++++------ lib/Analysis/DataStructure/EquivClassGraphs.cpp | 9 +++------ lib/Analysis/DataStructure/Steensgaard.cpp | 3 +-- 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/lib/Analysis/DataStructure/BottomUpClosure.cpp b/lib/Analysis/DataStructure/BottomUpClosure.cpp index 5549c8a6722..2dae9432319 100644 --- a/lib/Analysis/DataStructure/BottomUpClosure.cpp +++ b/lib/Analysis/DataStructure/BottomUpClosure.cpp @@ -269,8 +269,7 @@ unsigned BUDataStructures::calculateGraphs(Function *F, if (&G != SCCGraph) { { DSGraph::NodeMapTy NodeMap; - SCCGraph->cloneInto(G, SCCGraph->getScalarMap(), - SCCGraph->getReturnNodes(), NodeMap); + SCCGraph->cloneInto(G, SCCGraph->getReturnNodes(), NodeMap); } // Update the DSInfo map and delete the old graph... for (DSGraph::retnodes_iterator I = G.retnodes_begin(), @@ -414,8 +413,7 @@ void BUDataStructures::calculateGraph(DSGraph &Graph) { // bother merging it in again. if (!GI->containsFunction(*I)) { DSGraph::NodeMapTy NodeMap; - GI->cloneInto(getDSGraph(**I), GI->getScalarMap(), - GI->getReturnNodes(), NodeMap); + GI->cloneInto(getDSGraph(**I), GI->getReturnNodes(), NodeMap); ++NumBUInlines; } diff --git a/lib/Analysis/DataStructure/CompleteBottomUp.cpp b/lib/Analysis/DataStructure/CompleteBottomUp.cpp index 6f3a7c29fe3..bc8e04c100a 100644 --- a/lib/Analysis/DataStructure/CompleteBottomUp.cpp +++ b/lib/Analysis/DataStructure/CompleteBottomUp.cpp @@ -176,7 +176,7 @@ unsigned CompleteBUDataStructures::calculateSCCGraphs(DSGraph &FG, ValMap[NG] = ~0U; DSGraph::NodeMapTy NodeMap; - FG.cloneInto(*NG, FG.getScalarMap(), FG.getReturnNodes(), NodeMap); + FG.cloneInto(*NG, FG.getReturnNodes(), NodeMap); // Update the DSInfo map and delete the old graph... for (DSGraph::retnodes_iterator I = NG->retnodes_begin(); diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp index e2edb1cb725..d91acfb5252 100644 --- a/lib/Analysis/DataStructure/DataStructure.cpp +++ b/lib/Analysis/DataStructure/DataStructure.cpp @@ -1169,14 +1169,14 @@ DSGraph::DSGraph(const DSGraph &G, EquivalenceClasses &ECs, : GlobalsGraph(0), ScalarMap(ECs), TD(G.TD) { PrintAuxCalls = false; NodeMapTy NodeMap; - cloneInto(G, ScalarMap, ReturnNodes, NodeMap, CloneFlags); + cloneInto(G, ReturnNodes, NodeMap, CloneFlags); } DSGraph::DSGraph(const DSGraph &G, NodeMapTy &NodeMap, EquivalenceClasses &ECs) : GlobalsGraph(0), ScalarMap(ECs), TD(G.TD) { PrintAuxCalls = false; - cloneInto(G, ScalarMap, ReturnNodes, NodeMap); + cloneInto(G, ReturnNodes, NodeMap); } DSGraph::~DSGraph() { @@ -1236,12 +1236,13 @@ DSNode *DSGraph::addObjectToGraph(Value *Ptr, bool UseDeclaredType) { /// cloneInto - Clone the specified DSGraph into the current graph. The -/// translated ScalarMap for the old function is filled into the OldValMap -/// member, and the translated ReturnNodes map is returned into ReturnNodes. +/// translated ScalarMap for the old function is filled into the ScalarMap +/// for the graph, and the translated ReturnNodes map is returned into +/// ReturnNodes. /// /// The CloneFlags member controls various aspects of the cloning process. /// -void DSGraph::cloneInto(const DSGraph &G, DSScalarMap &OldValMap, +void DSGraph::cloneInto(const DSGraph &G, ReturnNodesTy &OldReturnNodes, NodeMapTy &OldNodeMap, unsigned CloneFlags) { TIME_REGION(X, "cloneInto"); @@ -1281,7 +1282,7 @@ void DSGraph::cloneInto(const DSGraph &G, DSScalarMap &OldValMap, for (DSScalarMap::const_iterator I = G.ScalarMap.begin(), E = G.ScalarMap.end(); I != E; ++I) { DSNodeHandle &MappedNode = OldNodeMap[I->second.getNode()]; - DSNodeHandle &H = OldValMap[I->first]; + DSNodeHandle &H = ScalarMap[I->first]; DSNode *MappedNodeN = MappedNode.getNode(); H.mergeWith(DSNodeHandle(MappedNodeN, I->second.getOffset()+MappedNode.getOffset())); diff --git a/lib/Analysis/DataStructure/EquivClassGraphs.cpp b/lib/Analysis/DataStructure/EquivClassGraphs.cpp index a5621911e42..83b9d9a3f8d 100644 --- a/lib/Analysis/DataStructure/EquivClassGraphs.cpp +++ b/lib/Analysis/DataStructure/EquivClassGraphs.cpp @@ -270,11 +270,8 @@ void EquivClassGraphs::buildIndirectFunctionSets(Module &M) { } // Clone this member of the equivalence class into MergedG. - { - DSGraph::NodeMapTy NodeMap; - MergedG.cloneInto(CBUGraph, MergedG.getScalarMap(), - MergedG.getReturnNodes(), NodeMap, 0); - } + DSGraph::NodeMapTy NodeMap; + MergedG.cloneInto(CBUGraph, MergedG.getReturnNodes(), NodeMap, 0); } // Merge the return nodes of all functions together. @@ -366,7 +363,7 @@ processSCC(DSGraph &FG, std::vector &Stack, unsigned &NextID, // If the SCC found is not the same as those found in CBU, make sure to // merge the graphs as appropriate. DSGraph::NodeMapTy NodeMap; - FG.cloneInto(*NG, FG.getScalarMap(), FG.getReturnNodes(), NodeMap); + FG.cloneInto(*NG, FG.getReturnNodes(), NodeMap); // Update the DSInfo map and delete the old graph... for (DSGraph::retnodes_iterator I = NG->retnodes_begin(); diff --git a/lib/Analysis/DataStructure/Steensgaard.cpp b/lib/Analysis/DataStructure/Steensgaard.cpp index d6740277815..45637ffd73f 100644 --- a/lib/Analysis/DataStructure/Steensgaard.cpp +++ b/lib/Analysis/DataStructure/Steensgaard.cpp @@ -130,8 +130,7 @@ bool Steens::runOnModule(Module &M) { for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) if (!I->isExternal()) { DSGraph::NodeMapTy NodeMap; - ResultGraph->cloneInto(LDS.getDSGraph(*I), ResultGraph->getScalarMap(), - RetValMap, NodeMap, 0); + ResultGraph->cloneInto(LDS.getDSGraph(*I), RetValMap, NodeMap, 0); } ResultGraph->removeTriviallyDeadNodes();