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

[Chris Lattner]

Changes in directory llvm/lib/Analysis/DataStructure:

BottomUpClosure.cpp updated: 1.75 -> 1.76
CompleteBottomUp.cpp updated: 1.6 -> 1.7

---
Log message:

There is no need to merge the globals graph into the function graphs at the
end of the BU and CBU passes.  The globals will be marked incomplete, so it
doesn't matter if they are missing some info, and merging isn't guaranteed
to bring everything in anyway!


---
Diffs of the changes:  (+3 -10)

Index: llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp
diff -u llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp:1.75 llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp:1.76
--- llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp:1.75	Tue Feb 17 13:06:47 2004
+++ llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp	Fri Feb 20 17:52:14 2004
@@ -320,12 +320,8 @@
 
   TempFCs.clear();
 
-  // Re-materialize nodes from the globals graph.
-  // Do not ignore globals inlined from callees -- they are not up-to-date!
-  assert(Graph.getInlinedGlobals().empty());
-  Graph.updateFromGlobalGraph();
-
   // Recompute the Incomplete markers
+  assert(Graph.getInlinedGlobals().empty());
   Graph.maskIncompleteMarkers();
   Graph.markIncompleteNodes(DSGraph::MarkFormalArgs);
 


Index: llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp
diff -u llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp:1.6 llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp:1.7
--- llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp:1.6	Sat Feb  7 19:53:10 2004
+++ llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp	Fri Feb 20 17:52:15 2004
@@ -168,6 +168,7 @@
 /// processGraph - Process the BU graphs for the program in bottom-up order on
 /// the SCC of the __ACTUAL__ call graph.  This builds "complete" BU graphs.
 void CompleteBUDataStructures::processGraph(DSGraph &G) {
+
   // The edges out of the current node are the call site targets...
   for (unsigned i = 0, e = G.getFunctionCalls().size(); i != e; ++i) {
     const DSCallSite &CS = G.getFunctionCalls()[i];
@@ -192,12 +193,8 @@
     }
   }
 
-  // Re-materialize nodes from the globals graph.
-  // Do not ignore globals inlined from callees -- they are not up-to-date!
-  assert(G.getInlinedGlobals().empty());
-  G.updateFromGlobalGraph();
-
   // Recompute the Incomplete markers
+  assert(G.getInlinedGlobals().empty());
   G.maskIncompleteMarkers();
   G.markIncompleteNodes(DSGraph::MarkFormalArgs);