1 files changed, 26 insertions, 32 deletions

diff --git a/tests/benchmarks/corelib/tools/qvector/qrawvector.h b/tests/benchmarks/corelib/tools/qvector/qrawvector.h
index 7e570d93ff..0fdfa86f1d 100644
--- a/tests/benchmarks/corelib/tools/qvector/qrawvector.h
+++ b/tests/benchmarks/corelib/tools/qvector/qrawvector.h
@@ -66,24 +66,18 @@ QT_BEGIN_NAMESPACE
 template <typename T>
 class QRawVector
 {
-    struct Data : QVectorData { T array[1]; };
+    typedef QVectorTypedData<T> Data;
 
     T *m_begin;
     int m_size;
     int m_alloc;
 
 public:
-    //static Data dummy;
-    //int headerOffset() { return (char*)&dummy.array - (char*)&dummy; }
-    inline int headerOffset() const {
-        // gcc complains about: return offsetof(Data, array); and also
-        // does not like '0' in the expression below.
-        return (char *)&(((Data *)(1))->array) - (char *)1;
-    }
-    inline Data *toBase(T *begin) const
-    { return (Data*)((char*)begin - headerOffset()); }
-    inline T *fromBase(void *d)  const
-    { return (T*)((char*)d + headerOffset()); }
+    static Data *toBase(T *begin)
+    { return (Data*)((char*)begin - offsetOfTypedData()); }
+    static T *fromBase(void *d)
+    { return (T*)((char*)d + offsetOfTypedData()); }
+
     inline QRawVector() 
     { m_begin = fromBase(0); m_alloc = m_size = 0; realloc(m_size, m_alloc, true); }
     explicit QRawVector(int size);
@@ -270,17 +264,20 @@ private:
     T *allocate(int alloc);
     void realloc(int size, int alloc, bool ref);
     void free(T *begin, int size);
-    int sizeOfTypedData() {
-        // this is more or less the same as sizeof(Data), except that it doesn't
-        // count the padding at the end
-        return reinterpret_cast<const char *>(&(reinterpret_cast<const Data *>(this))->array[1]) - reinterpret_cast<const char *>(this);
+
+    class AlignmentDummy { QVectorData header; T array[1]; };
+
+    static Q_DECL_CONSTEXPR int offsetOfTypedData()
+    {
+        // (non-POD)-safe offsetof(AlignmentDummy, array)
+        return (sizeof(QVectorData) + (alignOfTypedData() - 1)) & ~(alignOfTypedData() - 1);
     }
-    static inline int alignOfTypedData()
+    static Q_DECL_CONSTEXPR int alignOfTypedData()
     {
 #ifdef Q_ALIGNOF
-        return qMax<int>(sizeof(void*), Q_ALIGNOF(Data));
+        return Q_ALIGNOF(AlignmentDummy);
 #else
-        return 0;
+        return sizeof(void *);
 #endif
     }
 
@@ -288,11 +285,11 @@ public:
     QVector<T> mutateToVector()
     {
         Data *d = toBase(m_begin);
-        d->ref = 1;
+        d->ref.initializeOwned();
         d->alloc = m_alloc;
         d->size = m_size;
-        d->sharable = 0;
-        d->capacity = 0;
+        d->capacityReserved = 0;
+        d->offset = offsetOfTypedData();
 
         QVector<T> v;
         *reinterpret_cast<QVectorData **>(&v) = d;
@@ -309,7 +306,7 @@ void QRawVector<T>::reserve(int asize)
 template <typename T>
 void QRawVector<T>::resize(int asize)
 { realloc(asize, (asize > m_alloc || (asize < m_size && asize < (m_alloc >> 1)))
-    ? QVectorData::grow(sizeOfTypedData(), asize, sizeof(T), QTypeInfo<T>::isStatic)
+    ? QVectorData::grow(offsetOfTypedData(), asize, sizeof(T))
     : m_alloc, false); }
 template <typename T>
 inline void QRawVector<T>::clear()
@@ -370,7 +367,7 @@ QRawVector<T> &QRawVector<T>::operator=(const QRawVector<T> &v)
 template <typename T>
 inline T *QRawVector<T>::allocate(int aalloc)
 {
-    QVectorData *d = QVectorData::allocate(sizeOfTypedData() + (aalloc - 1) * sizeof(T), alignOfTypedData());
+    QVectorData *d = QVectorData::allocate(offsetOfTypedData() + aalloc * sizeof(T), alignOfTypedData());
     Q_CHECK_PTR(d);
     return fromBase(d);
 }
@@ -446,10 +443,9 @@ void QRawVector<T>::realloc(int asize, int aalloc, bool ref)
             changed = true;
         } else {
             QT_TRY {
-                QVectorData *mem = QVectorData::reallocate(
-                    toBase(m_begin), sizeOfTypedData() + (aalloc - 1) * sizeof(T),
-                                                           sizeOfTypedData()
-+ (xalloc - 1) * sizeof(T), alignOfTypedData());
+                QVectorData *mem = QVectorData::reallocate(toBase(m_begin),
+                        offsetOfTypedData() + aalloc * sizeof(T),
+                        offsetOfTypedData() + xalloc * sizeof(T), alignOfTypedData());
                 Q_CHECK_PTR(mem);
                 xbegin = fromBase(mem);
                 xsize = m_size;
@@ -511,8 +507,7 @@ void QRawVector<T>::append(const T &t)
 {
     if (m_size + 1 > m_alloc) {
         const T copy(t);
-        realloc(m_size, QVectorData::grow(sizeOfTypedData(), m_size + 1, sizeof(T),
-                                           QTypeInfo<T>::isStatic), false);
+        realloc(m_size, QVectorData::grow(offsetOfTypedData(), m_size + 1, sizeof(T)), false);
         if (QTypeInfo<T>::isComplex)
             new (m_begin + m_size) T(copy);
         else
@@ -533,8 +528,7 @@ typename QRawVector<T>::iterator QRawVector<T>::insert(iterator before, size_typ
     if (n != 0) {
         const T copy(t);
         if (m_size + n > m_alloc)
-            realloc(m_size, QVectorData::grow(sizeOfTypedData(), m_size + n, sizeof(T),
-                                               QTypeInfo<T>::isStatic), false);
+            realloc(m_size, QVectorData::grow(offsetOfTypedData(), m_size + n, sizeof(T)), false);
         if (QTypeInfo<T>::isStatic) {
             T *b = m_begin + m_size;
             T *i = m_begin + m_size + n;