From 715a3a3b5ce9a79e15cc8161155d77dca194dfcd Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sat, 9 Nov 2002 22:07:02 +0000 Subject: 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. llvm-svn: 4666 --- llvm/lib/Analysis/DataStructure/DataStructure.cpp | 32 +++-------------------- 1 file changed, 4 insertions(+), 28 deletions(-) (limited to 'llvm/lib/Analysis/DataStructure/DataStructure.cpp') diff --git a/llvm/lib/Analysis/DataStructure/DataStructure.cpp b/llvm/lib/Analysis/DataStructure/DataStructure.cpp index aab344bb99c..cc43544504f 100644 --- a/llvm/lib/Analysis/DataStructure/DataStructure.cpp +++ b/llvm/lib/Analysis/DataStructure/DataStructure.cpp @@ -810,9 +810,9 @@ static void removeIdenticalCalls(vector &Calls, // 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 @@ static void markGlobalsAlive(DSGraph &G, std::set &Alive, // 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 @@ void DSGraph::removeDeadNodes(bool KeepAllGlobals) { // 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 DeadNodes; DeadNodes.reserve(Nodes.size()); // Only one allocation is allowed. @@ -1129,23 +1122,6 @@ DSNode* GlobalDSGraph::cloneNodeInto(DSNode *OldNode, } -// 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 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. // -- cgit v1.2.3