[llvm-commits] CVS: llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp CompleteBottomUp.cpp DataStructure.cpp EquivClassGraphs.cpp Steensgaard.cpp
Chris Lattner
lattner at cs.uiuc.edu
Mon Mar 21 16:21:18 PST 2005
Changes in directory llvm/lib/Analysis/DataStructure:
BottomUpClosure.cpp updated: 1.102 -> 1.103
CompleteBottomUp.cpp updated: 1.25 -> 1.26
DataStructure.cpp updated: 1.220 -> 1.221
EquivClassGraphs.cpp updated: 1.36 -> 1.37
Steensgaard.cpp updated: 1.50 -> 1.51
---
Log message:
remove the second argument to cloneInto
---
Diffs of the changes: (+14 -19)
BottomUpClosure.cpp | 6 ++----
CompleteBottomUp.cpp | 2 +-
DataStructure.cpp | 13 +++++++------
EquivClassGraphs.cpp | 9 +++------
Steensgaard.cpp | 3 +--
5 files changed, 14 insertions(+), 19 deletions(-)
Index: llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp
diff -u llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp:1.102 llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp:1.103
--- llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp:1.102 Mon Mar 21 14:20:49 2005
+++ llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp Mon Mar 21 18:21:05 2005
@@ -269,8 +269,7 @@
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 @@
// 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;
}
Index: llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp
diff -u llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp:1.25 llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp:1.26
--- llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp:1.25 Sat Mar 19 22:29:39 2005
+++ llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp Mon Mar 21 18:21:05 2005
@@ -176,7 +176,7 @@
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();
Index: llvm/lib/Analysis/DataStructure/DataStructure.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.220 llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.221
--- llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.220 Mon Mar 21 18:09:45 2005
+++ llvm/lib/Analysis/DataStructure/DataStructure.cpp Mon Mar 21 18:21:05 2005
@@ -1169,14 +1169,14 @@
: 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<GlobalValue*> &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 @@
/// 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 @@
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()));
Index: llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp
diff -u llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp:1.36 llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp:1.37
--- llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp:1.36 Sat Mar 19 22:29:39 2005
+++ llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp Mon Mar 21 18:21:05 2005
@@ -270,11 +270,8 @@
}
// 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 @@
// 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();
Index: llvm/lib/Analysis/DataStructure/Steensgaard.cpp
diff -u llvm/lib/Analysis/DataStructure/Steensgaard.cpp:1.50 llvm/lib/Analysis/DataStructure/Steensgaard.cpp:1.51
--- llvm/lib/Analysis/DataStructure/Steensgaard.cpp:1.50 Mon Mar 21 18:04:21 2005
+++ llvm/lib/Analysis/DataStructure/Steensgaard.cpp Mon Mar 21 18:21:05 2005
@@ -130,8 +130,7 @@
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();
More information about the llvm-commits
mailing list