[llvm-commits] CVS: llvm/lib/Analysis/DataStructure/DataStructure.cpp EquivClassGraphs.cpp

[Chris Lattner]

Changes in directory llvm/lib/Analysis/DataStructure:

DataStructure.cpp updated: 1.199 -> 1.200
EquivClassGraphs.cpp updated: 1.24 -> 1.25
---
Log message:

add a method to compute a commonly used mapping.


---
Diffs of the changes:  (+16 -5)

 DataStructure.cpp    |   13 +++++++++++++
 EquivClassGraphs.cpp |    8 +++-----
 2 files changed, 16 insertions(+), 5 deletions(-)


Index: llvm/lib/Analysis/DataStructure/DataStructure.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.199 llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.200
--- llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.199	Sun Mar 13 14:36:01 2005
+++ llvm/lib/Analysis/DataStructure/DataStructure.cpp	Mon Mar 14 13:22:47 2005
@@ -2082,3 +2082,16 @@
       computeNodeMapping(N1->getLink(i),
                          N2->getLink(unsigned(N2Idx+i) % N2Size), NodeMap);
 }
+
+
+/// computeGlobalGraphMapping - Compute the mapping of nodes in the global
+/// graph to nodes in this graph.
+void DSGraph::computeGlobalGraphMapping(NodeMapTy &NodeMap) {
+  DSGraph &GG = *getGlobalsGraph();
+
+  DSScalarMap &SM = getScalarMap();
+  for (DSScalarMap::global_iterator I = SM.global_begin(),
+         E = SM.global_end(); I != E; ++I)
+    DSGraph::computeNodeMapping(SM[*I], GG.getNodeForValue(*I), NodeMap);
+}
+                                


Index: llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp
diff -u llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp:1.24 llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp:1.25
--- llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp:1.24	Sun Mar 13 14:32:26 2005
+++ llvm/lib/Analysis/DataStructure/EquivClassGraphs.cpp	Mon Mar 14 13:22:47 2005
@@ -45,13 +45,11 @@
   for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
     if (!I->isExternal()) {
       DSGraph &G = ECGraphs.getDSGraph(*I);
+      if (G.getReturnNodes().begin()->first != I)
+        continue;  // Only check a graph once.
 
       DSGraph::NodeMapTy GlobalsGraphNodeMapping;
-      for (DSScalarMap::global_iterator I = G.getScalarMap().global_begin(),
-             E = G.getScalarMap().global_end(); I != E; ++I)
-        DSGraph::computeNodeMapping(G.getNodeForValue(*I),
-                                    GG.getNodeForValue(*I),
-                                    GlobalsGraphNodeMapping);
+      G.computeGlobalGraphMapping(GlobalsGraphNodeMapping);
     } 
 }
 #endif