diff options
| author | Dan Gohman <gohman@apple.com> | 2008-07-28 21:51:04 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2008-07-28 21:51:04 +0000 |
| commit | fed90b6d097d50881afb45e4d79f430db66dd741 (patch) | |
| tree | 7ec1a6f6b2a8a37e054b84505502b3346c6680c7 /lib/VMCore | |
| parent | 80e051dfdede65678ac66f1552278338bc1a1b33 (diff) | |
Fold the useful features of alist and alist_node into ilist, and
a new ilist_node class, and remove them. Unlike alist_node,
ilist_node doesn't attempt to manage storage itself, so it avoids
the associated problems, including being opaque in gdb.
Adjust the Recycler class so that it doesn't depend on alist_node.
Also, change it to use explicit Size and Align parameters, allowing
it to work when the largest-sized node doesn't have the greatest
alignment requirement.
Change MachineInstr's MachineMemOperand list from a pool-backed
alist to a std::list for now.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@54146 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/VMCore')
| -rw-r--r-- | lib/VMCore/BasicBlock.cpp | 5 | ||||
| -rw-r--r-- | lib/VMCore/SymbolTableListTraitsImpl.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/VMCore/BasicBlock.cpp b/lib/VMCore/BasicBlock.cpp index 64711fea0c..514aa1de23 100644 --- a/lib/VMCore/BasicBlock.cpp +++ b/lib/VMCore/BasicBlock.cpp @@ -15,6 +15,7 @@ #include "llvm/Constants.h" #include "llvm/Instructions.h" #include "llvm/Type.h" +#include "llvm/ADT/STLExtras.h" #include "llvm/Support/CFG.h" #include "llvm/Support/LeakDetector.h" #include "llvm/Support/Compiler.h" @@ -260,7 +261,9 @@ BasicBlock *BasicBlock::splitBasicBlock(iterator I, const std::string &BBName) { assert(I != InstList.end() && "Trying to get me to create degenerate basic block!"); - BasicBlock *New = BasicBlock::Create(BBName, getParent(), getNext()); + BasicBlock *InsertBefore = next(Function::iterator(this)) + .getNodePtrUnchecked(); + BasicBlock *New = BasicBlock::Create(BBName, getParent(), InsertBefore); // Move all of the specified instructions from the original basic block into // the new basic block. diff --git a/lib/VMCore/SymbolTableListTraitsImpl.h b/lib/VMCore/SymbolTableListTraitsImpl.h index 2a3b3d835d..72687bb5e0 100644 --- a/lib/VMCore/SymbolTableListTraitsImpl.h +++ b/lib/VMCore/SymbolTableListTraitsImpl.h @@ -84,7 +84,7 @@ void SymbolTableListTraits<ValueSubClass,ItemParentClass> template<typename ValueSubClass, typename ItemParentClass> void SymbolTableListTraits<ValueSubClass,ItemParentClass> -::transferNodesFromList(iplist<ValueSubClass, ilist_traits<ValueSubClass> > &L2, +::transferNodesFromList(ilist_traits<ValueSubClass> &L2, ilist_iterator<ValueSubClass> first, ilist_iterator<ValueSubClass> last) { // We only have to do work here if transferring instructions between BBs |