diff options
| author | Duncan Sands <baldrick@free.fr> | 2010-07-08 13:06:08 +0000 |
|---|---|---|
| committer | Duncan Sands <baldrick@free.fr> | 2010-07-08 13:06:08 +0000 |
| commit | 2dac4c1b519feaf1ef63514f07fa16aa5dc7d89a (patch) | |
| tree | d25ff0f4f1c9631f7d680421ec7e28017a4870a0 | |
| parent | cde51108def63dbb68ffd47f8950b8bdd43dd074 (diff) | |
| download | llvm-2dac4c1b519feaf1ef63514f07fa16aa5dc7d89a.tar.gz llvm-2dac4c1b519feaf1ef63514f07fa16aa5dc7d89a.tar.bz2 llvm-2dac4c1b519feaf1ef63514f07fa16aa5dc7d89a.tar.xz | |
Use std::vector rather than SmallVector here because SmallVector
causes some versions of gcc to crash when building LLVM.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@107869 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/llvm/ADT/PostOrderIterator.h | 3 | ||||
| -rw-r--r-- | include/llvm/Analysis/IntervalIterator.h | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/llvm/ADT/PostOrderIterator.h b/include/llvm/ADT/PostOrderIterator.h index 575786fa68..47e5b2bd4a 100644 --- a/include/llvm/ADT/PostOrderIterator.h +++ b/include/llvm/ADT/PostOrderIterator.h @@ -18,7 +18,6 @@ #include "llvm/ADT/GraphTraits.h" #include "llvm/ADT/SmallPtrSet.h" -#include "llvm/ADT/SmallVector.h" #include <set> #include <vector> @@ -52,7 +51,7 @@ class po_iterator : public std::iterator<std::forward_iterator_tag, // VisitStack - Used to maintain the ordering. Top = current block // First element is basic block pointer, second is the 'next child' to visit - SmallVector<std::pair<NodeType *, ChildItTy>, 16> VisitStack; + std::vector<std::pair<NodeType *, ChildItTy> > VisitStack; void traverseChild() { while (VisitStack.back().second != GT::child_end(VisitStack.back().first)) { diff --git a/include/llvm/Analysis/IntervalIterator.h b/include/llvm/Analysis/IntervalIterator.h index f0130efd6d..82b3294cc5 100644 --- a/include/llvm/Analysis/IntervalIterator.h +++ b/include/llvm/Analysis/IntervalIterator.h @@ -33,12 +33,12 @@ #ifndef LLVM_INTERVAL_ITERATOR_H #define LLVM_INTERVAL_ITERATOR_H -#include "llvm/ADT/SmallVector.h" #include "llvm/Analysis/IntervalPartition.h" #include "llvm/Function.h" #include "llvm/Support/CFG.h" -#include <set> #include <algorithm> +#include <set> +#include <vector> namespace llvm { @@ -88,7 +88,7 @@ inline void addNodeToInterval(Interval *Int, Interval *I) { template<class NodeTy, class OrigContainer_t, class GT = GraphTraits<NodeTy*>, class IGT = GraphTraits<Inverse<NodeTy*> > > class IntervalIterator { - SmallVector<std::pair<Interval*, typename Interval::succ_iterator>, 16> IntStack; + std::vector<std::pair<Interval*, typename Interval::succ_iterator> > IntStack; std::set<BasicBlock*> Visited; OrigContainer_t *OrigContainer; bool IOwnMem; // If True, delete intervals when done with them |