eliminate the ability to remove global nodes from deadNodeElminate... for now.
This slows stuff down a bit, but it should get much better before it gets any
worse.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4666 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/DataStructure/DataStructure.cpp b/lib/Analysis/DataStructure/DataStructure.cpp
index aab344b..cc43544 100644
--- a/lib/Analysis/DataStructure/DataStructure.cpp
+++ b/lib/Analysis/DataStructure/DataStructure.cpp
@@ -810,9 +810,9 @@
// other nodes in the graph. These nodes will all be trivially unreachable, so
// we don't have to perform any non-trivial analysis here.
//
-void DSGraph::removeTriviallyDeadNodes(bool KeepAllGlobals) {
+void DSGraph::removeTriviallyDeadNodes() {
for (unsigned i = 0; i != Nodes.size(); ++i)
- if (!KeepAllGlobals || !(Nodes[i]->NodeType & DSNode::GlobalNode))
+ if (!(Nodes[i]->NodeType & DSNode::GlobalNode))
if (isNodeDead(Nodes[i])) { // This node is dead!
delete Nodes[i]; // Free memory...
Nodes.erase(Nodes.begin()+i--); // Remove from node list...
@@ -981,9 +981,9 @@
// from the caller's graph entirely. This is only appropriate to use when
// inlining graphs.
//
-void DSGraph::removeDeadNodes(bool KeepAllGlobals) {
+void DSGraph::removeDeadNodes() {
// Reduce the amount of work we have to do...
- removeTriviallyDeadNodes(KeepAllGlobals);
+ removeTriviallyDeadNodes();
// FIXME: Merge nontrivially identical call nodes...
@@ -1012,13 +1012,6 @@
// The return value is alive as well...
markAlive(RetNode.getNode(), Alive);
- // Mark all globals or cast nodes that can reach a live node as alive.
- // This also marks all nodes reachable from such nodes as alive.
- // Of course, if KeepAllGlobals is specified, they would be live already.
-
- if (!KeepAllGlobals)
- markGlobalsAlive(*this, Alive, false);
-
// Loop over all unreachable nodes, dropping their references...
vector<DSNode*> DeadNodes;
DeadNodes.reserve(Nodes.size()); // Only one allocation is allowed.
@@ -1129,23 +1122,6 @@
}
-// GlobalDSGraph::cloneGlobals - Clone global nodes and all their externally
-// visible target links (and recursively their such links) into this graph.
-//
-void GlobalDSGraph::cloneGlobals(DSGraph& Graph, bool CloneCalls) {
- std::map<const DSNode*, DSNode*> NodeCache;
-#if 0
- for (unsigned i = 0, N = Graph.Nodes.size(); i < N; ++i)
- if (Graph.Nodes[i]->NodeType & DSNode::GlobalNode)
- GlobalsGraph->cloneNodeInto(Graph.Nodes[i], NodeCache, false);
- if (CloneCalls)
- GlobalsGraph->cloneCalls(Graph);
-
- GlobalsGraph->removeDeadNodes(/*KeepAllGlobals*/ true);
-#endif
-}
-
-
// GlobalDSGraph::cloneCalls - Clone function calls and their visible target
// links (and recursively their such links) into this graph.
//