From a928403ca41f8816f345550eb184175492b64e30 Mon Sep 17 00:00:00 2001 From: Anand Shukla Date: Tue, 25 Jun 2002 20:35:19 +0000 Subject: changes to make it compatible with 64bit gcc git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2789 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/DataStructure/EliminateNodes.cpp | 61 ++++++++++++++------------- 1 file changed, 31 insertions(+), 30 deletions(-) (limited to 'lib/Analysis/DataStructure/EliminateNodes.cpp') diff --git a/lib/Analysis/DataStructure/EliminateNodes.cpp b/lib/Analysis/DataStructure/EliminateNodes.cpp index 8a4ee822cf..06385d4b12 100644 --- a/lib/Analysis/DataStructure/EliminateNodes.cpp +++ b/lib/Analysis/DataStructure/EliminateNodes.cpp @@ -19,13 +19,14 @@ #include "llvm/Value.h" #include "Support/STLExtras.h" #include +#include //#define DEBUG_NODE_ELIMINATE 1 static void DestroyFirstNodeOfPair(DSNode *N1, DSNode *N2) { #ifdef DEBUG_NODE_ELIMINATE - cerr << "Found Indistinguishable Node:\n"; - N1->print(cerr); + std::cerr << "Found Indistinguishable Node:\n"; + N1->print(std::cerr); #endif // The nodes can be merged. Make sure that N2 contains all of the @@ -177,16 +178,16 @@ bool FunctionDSGraph::UnlinkUndistinguishableNodes() { } static void MarkReferredNodesReachable(DSNode *N, - vector &ShadowNodes, - vector &ReachableShadowNodes, - vector &AllocNodes, - vector &ReachableAllocNodes); + std::vector &ShadowNodes, + std::vector &ReachableShadowNodes, + std::vector &AllocNodes, + std::vector &ReachableAllocNodes); static inline void MarkReferredNodeSetReachable(const PointerValSet &PVS, - vector &ShadowNodes, - vector &ReachableShadowNodes, - vector &AllocNodes, - vector &ReachableAllocNodes) { + std::vector &ShadowNodes, + std::vector &ReachableShadowNodes, + std::vector &AllocNodes, + std::vector &ReachableAllocNodes) { for (unsigned i = 0, e = PVS.size(); i != e; ++i) if (isa(PVS[i].Node) || isa(PVS[i].Node)) MarkReferredNodesReachable(PVS[i].Node, ShadowNodes, ReachableShadowNodes, @@ -194,21 +195,21 @@ static inline void MarkReferredNodeSetReachable(const PointerValSet &PVS, } static void MarkReferredNodesReachable(DSNode *N, - vector &ShadowNodes, - vector &ReachableShadowNodes, - vector &AllocNodes, - vector &ReachableAllocNodes) { + std::vector &ShadowNodes, + std::vector &ReachableShadowNodes, + std::vector &AllocNodes, + std::vector &ReachableAllocNodes) { assert(ShadowNodes.size() == ReachableShadowNodes.size()); assert(AllocNodes.size() == ReachableAllocNodes.size()); if (ShadowDSNode *Shad = dyn_cast(N)) { - vector::iterator I = + std::vector::iterator I = std::find(ShadowNodes.begin(), ShadowNodes.end(), Shad); unsigned i = I-ShadowNodes.begin(); if (ReachableShadowNodes[i]) return; // Recursion detected, abort... ReachableShadowNodes[i] = true; } else if (AllocDSNode *Alloc = dyn_cast(N)) { - vector::iterator I = + std::vector::iterator I = std::find(AllocNodes.begin(), AllocNodes.end(), Alloc); unsigned i = I-AllocNodes.begin(); if (ReachableAllocNodes[i]) return; // Recursion detected, abort... @@ -229,8 +230,8 @@ static void MarkReferredNodesReachable(DSNode *N, } void FunctionDSGraph::MarkEscapeableNodesReachable( - vector &ReachableShadowNodes, - vector &ReachableAllocNodes) { + std::vector &ReachableShadowNodes, + std::vector &ReachableAllocNodes) { // Mark all shadow nodes that have edges from other nodes as reachable. // Recursively mark any shadow nodes pointed to by the newly live shadow // nodes as also alive. @@ -260,8 +261,8 @@ bool FunctionDSGraph::RemoveUnreachableNodes() { // Reachable*Nodes - Contains true if there is an edge from a reachable // node to the numbered node... // - vector ReachableShadowNodes(ShadowNodes.size()); - vector ReachableAllocNodes (AllocNodes.size()); + std::vector ReachableShadowNodes(ShadowNodes.size()); + std::vector ReachableAllocNodes (AllocNodes.size()); MarkEscapeableNodesReachable(ReachableShadowNodes, ReachableAllocNodes); @@ -282,8 +283,8 @@ bool FunctionDSGraph::RemoveUnreachableNodes() { if (!ReachableShadowNodes[i]) { // Track all unreachable nodes... #if DEBUG_NODE_ELIMINATE - cerr << "Unreachable node eliminated:\n"; - ShadowNodes[i]->print(cerr); + std::cerr << "Unreachable node eliminated:\n"; + ShadowNodes[i]->print(std::cerr); #endif ShadowNodes[i]->removeAllIncomingEdges(); delete ShadowNodes[i]; @@ -299,8 +300,8 @@ bool FunctionDSGraph::RemoveUnreachableNodes() { if (!ReachableAllocNodes[i]) { // Track all unreachable nodes... #if DEBUG_NODE_ELIMINATE - cerr << "Unreachable node eliminated:\n"; - AllocNodes[i]->print(cerr); + std::cerr << "Unreachable node eliminated:\n"; + AllocNodes[i]->print(std::cerr); #endif AllocNodes[i]->removeAllIncomingEdges(); delete AllocNodes[i]; @@ -346,9 +347,9 @@ bool FunctionDSGraph::RemoveUnreachableNodes() { // getEscapingAllocations - Add all allocations that escape the current // function to the specified vector. // -void FunctionDSGraph::getEscapingAllocations(vector &Allocs) { - vector ReachableShadowNodes(ShadowNodes.size()); - vector ReachableAllocNodes (AllocNodes.size()); +void FunctionDSGraph::getEscapingAllocations(std::vector &Allocs) { + std::vector ReachableShadowNodes(ShadowNodes.size()); + std::vector ReachableAllocNodes (AllocNodes.size()); MarkEscapeableNodesReachable(ReachableShadowNodes, ReachableAllocNodes); @@ -360,9 +361,9 @@ void FunctionDSGraph::getEscapingAllocations(vector &Allocs) { // getNonEscapingAllocations - Add all allocations that do not escape the // current function to the specified vector. // -void FunctionDSGraph::getNonEscapingAllocations(vector &Allocs) { - vector ReachableShadowNodes(ShadowNodes.size()); - vector ReachableAllocNodes (AllocNodes.size()); +void FunctionDSGraph::getNonEscapingAllocations(std::vector &Allocs) { + std::vector ReachableShadowNodes(ShadowNodes.size()); + std::vector ReachableAllocNodes (AllocNodes.size()); MarkEscapeableNodesReachable(ReachableShadowNodes, ReachableAllocNodes); -- cgit v1.2.3