6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

Make the range insert operation return an iterator, even though the STL

Browse Source 
range insert doesn't


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2413 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-04-29 21:23:30 +00:00
parent 91b078dd54
commit ea1e8c70eb
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/llvm/ValueHolder.h
View File

@ -118,14 +118,14 @@ public:
iterator insert(iterator Pos, ValueSubclass *Inst);
// ValueHolder::insert - This method inserts the specified _range_ of values
// before the 'Pos' iterator. This currently only works for vector
// iterators...
// before the 'Pos' iterator, returning a new iterator that points to the
// first item inserted. *This currently only works for vector iterators...*
//
// FIXME: This is not generic so that the code does not have to be around
// to be used... is this ok?
//
void insert(iterator Pos, // Where to insert
iterator First, iterator Last); // Vector to read insts from
iterator insert(iterator Pos, // Where to insert
iterator First, iterator Last); // Vector to read insts from
};
#endif

14
lib/VMCore/ValueHolderImpl.h
View File

@ -172,12 +172,18 @@ ValueHolder<ValueSubclass,ItemParentType,SymTabType>
// to be used... is this ok?
//
template<class ValueSubclass, class ItemParentType, class SymTabType>
void ValueHolder<ValueSubclass,ItemParentType,SymTabType>
::insert(iterator Pos, // Where to insert
ValueHolder<ValueSubclass,ItemParentType,SymTabType>::iterator
ValueHolder<ValueSubclass,ItemParentType,SymTabType>
::insert(iterator Pos, // Where to insert
iterator First, iterator Last) { // Vector to read insts from
// Since the vector range insert operation doesn't return an updated iterator,
// we have to convert the iterator to and index and back to assure that it
// cannot get invalidated. Gross hack, but effective.
//
unsigned Offset = Pos-begin();
// Check to make sure that the values are not already in some valueholder...
for (iterator X = First; X != Last; ++X) {
assert((*X)->getParent() == 0 &&
"Cannot insert into valueholder, value already has a parent!");
@ -192,6 +198,8 @@ void ValueHolder<ValueSubclass,ItemParentType,SymTabType>
for (;First != Last; ++First)
if ((*First)->hasName())
Parent->getSymbolTableSure()->insert(*First);
return begin()+Offset;
}
#endif