mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-10-11 23:25:15 +00:00
Bugfixes for smallvector when the element size is small and N is small.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29720 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
103febea8e
commit
2e6baf626d
@ -228,17 +228,30 @@ class SmallVector : public SmallVectorImpl<T> {
|
|||||||
/// InlineElts - These are 'N-1' elements that are stored inline in the body
|
/// InlineElts - These are 'N-1' elements that are stored inline in the body
|
||||||
/// of the vector. The extra '1' element is stored in SmallVectorImpl.
|
/// of the vector. The extra '1' element is stored in SmallVectorImpl.
|
||||||
typedef typename SmallVectorImpl<T>::U U;
|
typedef typename SmallVectorImpl<T>::U U;
|
||||||
U InlineElts[(sizeof(T)*N+sizeof(U)-1)/sizeof(U) - 1];
|
enum {
|
||||||
|
// MinUs - The number of U's require to cover N T's.
|
||||||
|
MinUs = (sizeof(T)*N+sizeof(U)-1)/sizeof(U),
|
||||||
|
|
||||||
|
// NumInlineEltsElts - The number of elements actually in this array. There
|
||||||
|
// is already one in the parent class, and we have to round up to avoid
|
||||||
|
// having a zero-element array.
|
||||||
|
NumInlineEltsElts = (MinUs - 1) > 0 ? (MinUs - 1) : 1,
|
||||||
|
|
||||||
|
// NumTsAvailable - The number of T's we actually have space for, which may
|
||||||
|
// be more than N due to rounding.
|
||||||
|
NumTsAvailable = (NumInlineEltsElts+1)*sizeof(U) / sizeof(T)
|
||||||
|
};
|
||||||
|
U InlineElts[NumInlineEltsElts];
|
||||||
public:
|
public:
|
||||||
SmallVector() : SmallVectorImpl<T>(N) {
|
SmallVector() : SmallVectorImpl<T>(NumTsAvailable) {
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename ItTy>
|
template<typename ItTy>
|
||||||
SmallVector(ItTy S, ItTy E) : SmallVectorImpl<T>(N) {
|
SmallVector(ItTy S, ItTy E) : SmallVectorImpl<T>(NumTsAvailable) {
|
||||||
append(S, E);
|
append(S, E);
|
||||||
}
|
}
|
||||||
|
|
||||||
SmallVector(const SmallVector &RHS) : SmallVectorImpl<T>(N) {
|
SmallVector(const SmallVector &RHS) : SmallVectorImpl<T>(NumTsAvailable) {
|
||||||
operator=(RHS);
|
operator=(RHS);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user