mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-09-07 16:54:48 +00:00
Fix SmallVector's insert to handle non-random-access iterators.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99633 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
9a52d0c352
commit
a7a33fd95f
@ -239,11 +239,20 @@ public:
|
|||||||
/// starting with "Dest", constructing elements into it as needed.
|
/// starting with "Dest", constructing elements into it as needed.
|
||||||
template<typename It1, typename It2>
|
template<typename It1, typename It2>
|
||||||
static void uninitialized_copy(It1 I, It1 E, It2 Dest) {
|
static void uninitialized_copy(It1 I, It1 E, It2 Dest) {
|
||||||
// Use memcpy for PODs: std::uninitialized_copy optimizes to memmove, memcpy
|
// Arbitrary iterator types; just use the basic implementation.
|
||||||
// is better.
|
std::uninitialized_copy(I, E, Dest);
|
||||||
memcpy(&*Dest, &*I, (E-I)*sizeof(T));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// uninitialized_copy - Copy the range [I, E) onto the uninitialized memory
|
||||||
|
/// starting with "Dest", constructing elements into it as needed.
|
||||||
|
template<typename T1, typename T2>
|
||||||
|
static void uninitialized_copy(T1 *I, T1 *E, T2 *Dest) {
|
||||||
|
// Use memcpy for PODs iterated by pointers (which includes SmallVector
|
||||||
|
// iterators): std::uninitialized_copy optimizes to memmove, but we can
|
||||||
|
// use memcpy here.
|
||||||
|
memcpy(Dest, I, (E-I)*sizeof(T));
|
||||||
|
}
|
||||||
|
|
||||||
/// grow - double the size of the allocated memory, guaranteeing space for at
|
/// grow - double the size of the allocated memory, guaranteeing space for at
|
||||||
/// least one more element or MinSize if specified.
|
/// least one more element or MinSize if specified.
|
||||||
void grow(size_t MinSize = 0) {
|
void grow(size_t MinSize = 0) {
|
||||||
@ -501,10 +510,13 @@ public:
|
|||||||
this->uninitialized_copy(I, OldEnd, this->end()-NumOverwritten);
|
this->uninitialized_copy(I, OldEnd, this->end()-NumOverwritten);
|
||||||
|
|
||||||
// Replace the overwritten part.
|
// Replace the overwritten part.
|
||||||
std::copy(From, From+NumOverwritten, I);
|
for (; NumOverwritten > 0; --NumOverwritten) {
|
||||||
|
*I = *From;
|
||||||
|
++I; ++From;
|
||||||
|
}
|
||||||
|
|
||||||
// Insert the non-overwritten middle part.
|
// Insert the non-overwritten middle part.
|
||||||
this->uninitialized_copy(From+NumOverwritten, To, OldEnd);
|
this->uninitialized_copy(From, To, OldEnd);
|
||||||
return I;
|
return I;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
#include "gtest/gtest.h"
|
#include "gtest/gtest.h"
|
||||||
#include "llvm/ADT/SmallVector.h"
|
#include "llvm/ADT/SmallVector.h"
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
#include <list>
|
||||||
|
|
||||||
using namespace llvm;
|
using namespace llvm;
|
||||||
|
|
||||||
@ -399,4 +400,9 @@ TEST_F(SmallVectorTest, DirectVectorTest) {
|
|||||||
EXPECT_EQ(4, theVector[3].getValue());
|
EXPECT_EQ(4, theVector[3].getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_F(SmallVectorTest, IteratorTest) {
|
||||||
|
std::list<int> L;
|
||||||
|
theVector.insert(theVector.end(), L.begin(), L.end());
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user