From c72c617a4ea3784c9a9f634478dc405ef6b2866b Mon Sep 17 00:00:00 2001 From: Alkis Evlogimenos Date: Tue, 28 Sep 2004 14:42:44 +0000 Subject: [PATCH] Add includes and use std:: for standard library calls to make code compile on windows. This patch was contributed by Paolo Invernizzi. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16539 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/PostOrderIterator.h | 4 +- lib/CodeGen/InstrSched/SchedGraphCommon.cpp | 1 + lib/CodeGen/ModuloScheduling/MSchedGraph.cpp | 3 +- .../ModuloScheduling/ModuloScheduling.cpp | 43 ++++++++++--------- lib/Support/DynamicLinker.cpp | 3 +- .../SparcV9/InstrSched/SchedGraphCommon.cpp | 1 + .../SparcV9/ModuloScheduling/MSchedGraph.cpp | 3 +- .../ModuloScheduling/ModuloScheduling.cpp | 43 ++++++++++--------- lib/Transforms/ExprTypeConvert.cpp | 4 +- 9 files changed, 56 insertions(+), 49 deletions(-) diff --git a/include/llvm/ADT/PostOrderIterator.h b/include/llvm/ADT/PostOrderIterator.h index 8ae46768b5a..961be340f71 100644 --- a/include/llvm/ADT/PostOrderIterator.h +++ b/include/llvm/ADT/PostOrderIterator.h @@ -39,14 +39,14 @@ class po_iterator : public forward_iterator { NodeType *BB = *VisitStack.top().second++; if (!Visited.count(BB)) { // If the block is not visited... Visited.insert(BB); - VisitStack.push(make_pair(BB, GT::child_begin(BB))); + VisitStack.push(std::make_pair(BB, GT::child_begin(BB))); } } } inline po_iterator(NodeType *BB) { Visited.insert(BB); - VisitStack.push(make_pair(BB, GT::child_begin(BB))); + VisitStack.push(std::make_pair(BB, GT::child_begin(BB))); traverseChild(); } inline po_iterator() { /* End is when stack is empty */ } diff --git a/lib/CodeGen/InstrSched/SchedGraphCommon.cpp b/lib/CodeGen/InstrSched/SchedGraphCommon.cpp index 0ad5f5844e7..9cae7c616cb 100644 --- a/lib/CodeGen/InstrSched/SchedGraphCommon.cpp +++ b/lib/CodeGen/InstrSched/SchedGraphCommon.cpp @@ -14,6 +14,7 @@ #include "llvm/CodeGen/SchedGraphCommon.h" #include "llvm/ADT/STLExtras.h" +#include #include namespace llvm { diff --git a/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp b/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp index 5bdcc9afcf2..17b38553685 100644 --- a/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp +++ b/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp @@ -18,6 +18,7 @@ #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Support/Debug.h" #include +#include using namespace llvm; MSchedGraphNode::MSchedGraphNode(const MachineInstr* inst, @@ -67,7 +68,7 @@ bool MSchedGraphNode::isSuccessor(MSchedGraphNode *succ) { bool MSchedGraphNode::isPredecessor(MSchedGraphNode *pred) { - if(find( Predecessors.begin(), Predecessors.end(), pred) != Predecessors.end()) + if(std::find( Predecessors.begin(), Predecessors.end(), pred) != Predecessors.end()) return true; else return false; diff --git a/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp b/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp index 9ad1e4ce4bd..10d7e9bf575 100644 --- a/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp +++ b/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp @@ -25,6 +25,7 @@ #include "llvm/Support/GraphWriter.h" #include "llvm/ADT/StringExtras.h" #include +#include #include #include #include @@ -580,7 +581,7 @@ void ModuloSchedulingPass::addReccurrence(std::vector &recurre if(R->second.size() == recurrence.size()) { for(std::vector::const_iterator node = R->second.begin(), end = R->second.end(); node != end; ++node) { - if(find(recurrence.begin(), recurrence.end(), *node) == recurrence.end()) { + if(std::find(recurrence.begin(), recurrence.end(), *node) == recurrence.end()) { all_same = all_same && false; break; } @@ -623,7 +624,7 @@ void ModuloSchedulingPass::findAllReccurrences(MSchedGraphNode *node, std::vector &visitedNodes, int II) { - if(find(visitedNodes.begin(), visitedNodes.end(), node) != visitedNodes.end()) { + if(std::find(visitedNodes.begin(), visitedNodes.end(), node) != visitedNodes.end()) { std::vector recurrence; bool first = true; int delay = 0; @@ -714,7 +715,7 @@ void ModuloSchedulingPass::computePartialOrder() { for(std::vector::const_iterator N = I->second.begin(), NE = I->second.end(); N != NE; ++N) { bool found = false; for(std::vector >::iterator PO = partialOrder.begin(), PE = partialOrder.end(); PO != PE; ++PO) { - if(find(PO->begin(), PO->end(), *N) != PO->end()) + if(std::find(PO->begin(), PO->end(), *N) != PO->end()) found = true; } if(!found) { @@ -728,16 +729,16 @@ void ModuloSchedulingPass::computePartialOrder() { //Check if we are supposed to ignore this edge or not if(!ignoreEdge(*P, *N)) //Check if already in this recurrence - if(find(I->second.begin(), I->second.end(), *P) == I->second.end()) { + if(std::find(I->second.begin(), I->second.end(), *P) == I->second.end()) { //Also need to check if in partial order bool predFound = false; for(std::vector >::iterator PO = partialOrder.begin(), PEND = partialOrder.end(); PO != PEND; ++PO) { - if(find(PO->begin(), PO->end(), *P) != PO->end()) + if(std::find(PO->begin(), PO->end(), *P) != PO->end()) predFound = true; } if(!predFound) - if(find(new_recurrence.begin(), new_recurrence.end(), *P) == new_recurrence.end()) + if(std::find(new_recurrence.begin(), new_recurrence.end(), *P) == new_recurrence.end()) new_recurrence.push_back(*P); } @@ -756,7 +757,7 @@ void ModuloSchedulingPass::computePartialOrder() { bool found = false; //Check if its already in our partial order, if not add it to the final vector for(std::vector >::iterator PO = partialOrder.begin(), PE = partialOrder.end(); PO != PE; ++PO) { - if(find(PO->begin(), PO->end(), I->first) != PO->end()) + if(std::find(PO->begin(), PO->end(), I->first) != PO->end()) found = true; } if(!found) @@ -772,7 +773,7 @@ void ModuloSchedulingPass::computePartialOrder() { void ModuloSchedulingPass::predIntersect(std::vector &CurrentSet, std::vector &IntersectResult) { //Sort CurrentSet so we can use lowerbound - sort(CurrentSet.begin(), CurrentSet.end()); + std::sort(CurrentSet.begin(), CurrentSet.end()); for(unsigned j=0; j < FinalNodeOrder.size(); ++j) { for(MSchedGraphNode::pred_iterator P = FinalNodeOrder[j]->pred_begin(), @@ -782,9 +783,9 @@ void ModuloSchedulingPass::predIntersect(std::vector &CurrentS if(ignoreEdge(*P,FinalNodeOrder[j])) continue; - if(find(CurrentSet.begin(), + if(std::find(CurrentSet.begin(), CurrentSet.end(), *P) != CurrentSet.end()) - if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end()) + if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end()) IntersectResult.push_back(*P); } } @@ -793,7 +794,7 @@ void ModuloSchedulingPass::predIntersect(std::vector &CurrentS void ModuloSchedulingPass::succIntersect(std::vector &CurrentSet, std::vector &IntersectResult) { //Sort CurrentSet so we can use lowerbound - sort(CurrentSet.begin(), CurrentSet.end()); + std::sort(CurrentSet.begin(), CurrentSet.end()); for(unsigned j=0; j < FinalNodeOrder.size(); ++j) { for(MSchedGraphNode::succ_iterator P = FinalNodeOrder[j]->succ_begin(), @@ -803,9 +804,9 @@ void ModuloSchedulingPass::succIntersect(std::vector &CurrentS if(ignoreEdge(FinalNodeOrder[j],*P)) continue; - if(find(CurrentSet.begin(), + if(std::find(CurrentSet.begin(), CurrentSet.end(), *P) != CurrentSet.end()) - if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end()) + if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end()) IntersectResult.push_back(*P); } } @@ -914,13 +915,13 @@ void ModuloSchedulingPass::orderNodes() { } //Append our node with greatest height to the NodeOrder - if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestHeightNode) == FinalNodeOrder.end()) { + if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestHeightNode) == FinalNodeOrder.end()) { DEBUG(std::cerr << "Adding node to Final Order: " << *highestHeightNode << "\n"); FinalNodeOrder.push_back(highestHeightNode); } //Remove V from IntersectOrder - IntersectCurrent.erase(find(IntersectCurrent.begin(), + IntersectCurrent.erase(std::find(IntersectCurrent.begin(), IntersectCurrent.end(), highestHeightNode)); @@ -929,11 +930,11 @@ void ModuloSchedulingPass::orderNodes() { E = highestHeightNode->succ_end(); P != E; ++P) { //if(lower_bound(CurrentSet->begin(), // CurrentSet->end(), *P) != CurrentSet->end()) { - if(find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) { + if(std::find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) { if(ignoreEdge(highestHeightNode, *P)) continue; //If not already in Intersect, add - if(find(IntersectCurrent.begin(), IntersectCurrent.end(), *P) == IntersectCurrent.end()) + if(std::find(IntersectCurrent.begin(), IntersectCurrent.end(), *P) == IntersectCurrent.end()) IntersectCurrent.push_back(*P); } } @@ -984,12 +985,12 @@ void ModuloSchedulingPass::orderNodes() { //Append highest depth node to the NodeOrder - if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestDepthNode) == FinalNodeOrder.end()) { + if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestDepthNode) == FinalNodeOrder.end()) { DEBUG(std::cerr << "Adding node to Final Order: " << *highestDepthNode << "\n"); FinalNodeOrder.push_back(highestDepthNode); } //Remove heightestDepthNode from IntersectOrder - IntersectCurrent.erase(find(IntersectCurrent.begin(), + IntersectCurrent.erase(std::find(IntersectCurrent.begin(), IntersectCurrent.end(),highestDepthNode)); @@ -998,13 +999,13 @@ void ModuloSchedulingPass::orderNodes() { E = highestDepthNode->pred_end(); P != E; ++P) { //if(lower_bound(CurrentSet->begin(), // CurrentSet->end(), *P) != CurrentSet->end()) { - if(find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) { + if(std::find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) { if(ignoreEdge(*P, highestDepthNode)) continue; //If not already in Intersect, add - if(find(IntersectCurrent.begin(), + if(std::find(IntersectCurrent.begin(), IntersectCurrent.end(), *P) == IntersectCurrent.end()) IntersectCurrent.push_back(*P); } diff --git a/lib/Support/DynamicLinker.cpp b/lib/Support/DynamicLinker.cpp index a6593034c7e..1ebe3f2e412 100644 --- a/lib/Support/DynamicLinker.cpp +++ b/lib/Support/DynamicLinker.cpp @@ -21,8 +21,9 @@ #include "llvm/Support/DynamicLinker.h" #include "llvm/Config/dlfcn.h" #include "llvm/Config/windows.h" -#include #include +#include +#include using namespace llvm; #if defined(HAVE_WINDOWS_H) diff --git a/lib/Target/SparcV9/InstrSched/SchedGraphCommon.cpp b/lib/Target/SparcV9/InstrSched/SchedGraphCommon.cpp index 0ad5f5844e7..9cae7c616cb 100644 --- a/lib/Target/SparcV9/InstrSched/SchedGraphCommon.cpp +++ b/lib/Target/SparcV9/InstrSched/SchedGraphCommon.cpp @@ -14,6 +14,7 @@ #include "llvm/CodeGen/SchedGraphCommon.h" #include "llvm/ADT/STLExtras.h" +#include #include namespace llvm { diff --git a/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.cpp b/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.cpp index 5bdcc9afcf2..17b38553685 100644 --- a/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.cpp +++ b/lib/Target/SparcV9/ModuloScheduling/MSchedGraph.cpp @@ -18,6 +18,7 @@ #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Support/Debug.h" #include +#include using namespace llvm; MSchedGraphNode::MSchedGraphNode(const MachineInstr* inst, @@ -67,7 +68,7 @@ bool MSchedGraphNode::isSuccessor(MSchedGraphNode *succ) { bool MSchedGraphNode::isPredecessor(MSchedGraphNode *pred) { - if(find( Predecessors.begin(), Predecessors.end(), pred) != Predecessors.end()) + if(std::find( Predecessors.begin(), Predecessors.end(), pred) != Predecessors.end()) return true; else return false; diff --git a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp index 9ad1e4ce4bd..10d7e9bf575 100644 --- a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp +++ b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp @@ -25,6 +25,7 @@ #include "llvm/Support/GraphWriter.h" #include "llvm/ADT/StringExtras.h" #include +#include #include #include #include @@ -580,7 +581,7 @@ void ModuloSchedulingPass::addReccurrence(std::vector &recurre if(R->second.size() == recurrence.size()) { for(std::vector::const_iterator node = R->second.begin(), end = R->second.end(); node != end; ++node) { - if(find(recurrence.begin(), recurrence.end(), *node) == recurrence.end()) { + if(std::find(recurrence.begin(), recurrence.end(), *node) == recurrence.end()) { all_same = all_same && false; break; } @@ -623,7 +624,7 @@ void ModuloSchedulingPass::findAllReccurrences(MSchedGraphNode *node, std::vector &visitedNodes, int II) { - if(find(visitedNodes.begin(), visitedNodes.end(), node) != visitedNodes.end()) { + if(std::find(visitedNodes.begin(), visitedNodes.end(), node) != visitedNodes.end()) { std::vector recurrence; bool first = true; int delay = 0; @@ -714,7 +715,7 @@ void ModuloSchedulingPass::computePartialOrder() { for(std::vector::const_iterator N = I->second.begin(), NE = I->second.end(); N != NE; ++N) { bool found = false; for(std::vector >::iterator PO = partialOrder.begin(), PE = partialOrder.end(); PO != PE; ++PO) { - if(find(PO->begin(), PO->end(), *N) != PO->end()) + if(std::find(PO->begin(), PO->end(), *N) != PO->end()) found = true; } if(!found) { @@ -728,16 +729,16 @@ void ModuloSchedulingPass::computePartialOrder() { //Check if we are supposed to ignore this edge or not if(!ignoreEdge(*P, *N)) //Check if already in this recurrence - if(find(I->second.begin(), I->second.end(), *P) == I->second.end()) { + if(std::find(I->second.begin(), I->second.end(), *P) == I->second.end()) { //Also need to check if in partial order bool predFound = false; for(std::vector >::iterator PO = partialOrder.begin(), PEND = partialOrder.end(); PO != PEND; ++PO) { - if(find(PO->begin(), PO->end(), *P) != PO->end()) + if(std::find(PO->begin(), PO->end(), *P) != PO->end()) predFound = true; } if(!predFound) - if(find(new_recurrence.begin(), new_recurrence.end(), *P) == new_recurrence.end()) + if(std::find(new_recurrence.begin(), new_recurrence.end(), *P) == new_recurrence.end()) new_recurrence.push_back(*P); } @@ -756,7 +757,7 @@ void ModuloSchedulingPass::computePartialOrder() { bool found = false; //Check if its already in our partial order, if not add it to the final vector for(std::vector >::iterator PO = partialOrder.begin(), PE = partialOrder.end(); PO != PE; ++PO) { - if(find(PO->begin(), PO->end(), I->first) != PO->end()) + if(std::find(PO->begin(), PO->end(), I->first) != PO->end()) found = true; } if(!found) @@ -772,7 +773,7 @@ void ModuloSchedulingPass::computePartialOrder() { void ModuloSchedulingPass::predIntersect(std::vector &CurrentSet, std::vector &IntersectResult) { //Sort CurrentSet so we can use lowerbound - sort(CurrentSet.begin(), CurrentSet.end()); + std::sort(CurrentSet.begin(), CurrentSet.end()); for(unsigned j=0; j < FinalNodeOrder.size(); ++j) { for(MSchedGraphNode::pred_iterator P = FinalNodeOrder[j]->pred_begin(), @@ -782,9 +783,9 @@ void ModuloSchedulingPass::predIntersect(std::vector &CurrentS if(ignoreEdge(*P,FinalNodeOrder[j])) continue; - if(find(CurrentSet.begin(), + if(std::find(CurrentSet.begin(), CurrentSet.end(), *P) != CurrentSet.end()) - if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end()) + if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end()) IntersectResult.push_back(*P); } } @@ -793,7 +794,7 @@ void ModuloSchedulingPass::predIntersect(std::vector &CurrentS void ModuloSchedulingPass::succIntersect(std::vector &CurrentSet, std::vector &IntersectResult) { //Sort CurrentSet so we can use lowerbound - sort(CurrentSet.begin(), CurrentSet.end()); + std::sort(CurrentSet.begin(), CurrentSet.end()); for(unsigned j=0; j < FinalNodeOrder.size(); ++j) { for(MSchedGraphNode::succ_iterator P = FinalNodeOrder[j]->succ_begin(), @@ -803,9 +804,9 @@ void ModuloSchedulingPass::succIntersect(std::vector &CurrentS if(ignoreEdge(FinalNodeOrder[j],*P)) continue; - if(find(CurrentSet.begin(), + if(std::find(CurrentSet.begin(), CurrentSet.end(), *P) != CurrentSet.end()) - if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end()) + if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), *P) == FinalNodeOrder.end()) IntersectResult.push_back(*P); } } @@ -914,13 +915,13 @@ void ModuloSchedulingPass::orderNodes() { } //Append our node with greatest height to the NodeOrder - if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestHeightNode) == FinalNodeOrder.end()) { + if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestHeightNode) == FinalNodeOrder.end()) { DEBUG(std::cerr << "Adding node to Final Order: " << *highestHeightNode << "\n"); FinalNodeOrder.push_back(highestHeightNode); } //Remove V from IntersectOrder - IntersectCurrent.erase(find(IntersectCurrent.begin(), + IntersectCurrent.erase(std::find(IntersectCurrent.begin(), IntersectCurrent.end(), highestHeightNode)); @@ -929,11 +930,11 @@ void ModuloSchedulingPass::orderNodes() { E = highestHeightNode->succ_end(); P != E; ++P) { //if(lower_bound(CurrentSet->begin(), // CurrentSet->end(), *P) != CurrentSet->end()) { - if(find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) { + if(std::find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) { if(ignoreEdge(highestHeightNode, *P)) continue; //If not already in Intersect, add - if(find(IntersectCurrent.begin(), IntersectCurrent.end(), *P) == IntersectCurrent.end()) + if(std::find(IntersectCurrent.begin(), IntersectCurrent.end(), *P) == IntersectCurrent.end()) IntersectCurrent.push_back(*P); } } @@ -984,12 +985,12 @@ void ModuloSchedulingPass::orderNodes() { //Append highest depth node to the NodeOrder - if(find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestDepthNode) == FinalNodeOrder.end()) { + if(std::find(FinalNodeOrder.begin(), FinalNodeOrder.end(), highestDepthNode) == FinalNodeOrder.end()) { DEBUG(std::cerr << "Adding node to Final Order: " << *highestDepthNode << "\n"); FinalNodeOrder.push_back(highestDepthNode); } //Remove heightestDepthNode from IntersectOrder - IntersectCurrent.erase(find(IntersectCurrent.begin(), + IntersectCurrent.erase(std::find(IntersectCurrent.begin(), IntersectCurrent.end(),highestDepthNode)); @@ -998,13 +999,13 @@ void ModuloSchedulingPass::orderNodes() { E = highestDepthNode->pred_end(); P != E; ++P) { //if(lower_bound(CurrentSet->begin(), // CurrentSet->end(), *P) != CurrentSet->end()) { - if(find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) { + if(std::find(CurrentSet->begin(), CurrentSet->end(), *P) != CurrentSet->end()) { if(ignoreEdge(*P, highestDepthNode)) continue; //If not already in Intersect, add - if(find(IntersectCurrent.begin(), + if(std::find(IntersectCurrent.begin(), IntersectCurrent.end(), *P) == IntersectCurrent.end()) IntersectCurrent.push_back(*P); } diff --git a/lib/Transforms/ExprTypeConvert.cpp b/lib/Transforms/ExprTypeConvert.cpp index 779e23c1992..72733570d2b 100644 --- a/lib/Transforms/ExprTypeConvert.cpp +++ b/lib/Transforms/ExprTypeConvert.cpp @@ -828,7 +828,7 @@ static bool OperandConvertibleToType(User *U, Value *V, const Type *Ty, } case Instruction::Call: { - User::op_iterator OI = find(I->op_begin(), I->op_end(), V); + User::op_iterator OI = std::find(I->op_begin(), I->op_end(), V); assert (OI != I->op_end() && "Not using value!"); unsigned OpNum = OI - I->op_begin(); @@ -1206,7 +1206,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal, } else { // Changing an argument, must be in vararg area std::vector::iterator OI = - find(Params.begin(), Params.end(), OldVal); + std::find(Params.begin(), Params.end(), OldVal); assert (OI != Params.end() && "Not using value!"); *OI = NewVal;