diff options
Diffstat (limited to 'tests/benchmarks/corelib/tools/qvector/qrawvector.h')
-rw-r--r-- | tests/benchmarks/corelib/tools/qvector/qrawvector.h | 48 |
1 files changed, 16 insertions, 32 deletions
diff --git a/tests/benchmarks/corelib/tools/qvector/qrawvector.h b/tests/benchmarks/corelib/tools/qvector/qrawvector.h index 9ad5f771bd..9e68b81285 100644 --- a/tests/benchmarks/corelib/tools/qvector/qrawvector.h +++ b/tests/benchmarks/corelib/tools/qvector/qrawvector.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QRAWVECTOR_H #define QRAWVECTOR_H @@ -41,8 +16,16 @@ #include <stdlib.h> #include <string.h> -QT_BEGIN_NAMESPACE +const int million = 1000000; +extern double accumulate; + +// Defined in outofline.cpp +extern QVector<double> qvector_fill_and_return_helper(); +extern QVector<double> qrawvector_fill_and_return_helper(); +extern std::vector<double> stdvector_fill_and_return_helper(); +extern QVector<double> mixedvector_fill_and_return_helper(); +QT_BEGIN_NAMESPACE struct QVectorData { @@ -204,12 +187,12 @@ private: class AlignmentDummy { QVectorData header; T array[1]; }; - static Q_DECL_CONSTEXPR int offsetOfTypedData() + static constexpr int offsetOfTypedData() { // (non-POD)-safe offsetof(AlignmentDummy, array) return (sizeof(QVectorData) + (alignOfTypedData() - 1)) & ~(alignOfTypedData() - 1); } - static Q_DECL_CONSTEXPR int alignOfTypedData() + static constexpr int alignOfTypedData() { return alignof(AlignmentDummy); } @@ -217,6 +200,7 @@ private: public: QVector<T> mutateToVector() { + Q_ASSERT(!"Fix QTBUG-95061 before calling this; it is broken beyond repair"); Data *d = toBase(m_begin); d->ref.initializeOwned(); d->alloc = m_alloc; @@ -361,7 +345,7 @@ void QRawVector<T>::realloc(int asize, int aalloc, bool ref) T *xbegin = m_begin; if (aalloc != xalloc || ref) { // (re)allocate memory - if (QTypeInfo<T>::isStatic) { + if (!QTypeInfo<T>::isRelocatable) { xbegin = allocate(aalloc); xsize = 0; changed = true; @@ -462,7 +446,7 @@ typename QRawVector<T>::iterator QRawVector<T>::insert(iterator before, size_typ const T copy(t); if (m_size + n > m_alloc) realloc(m_size, QVectorData::grow(offsetOfTypedData(), m_size + n, sizeof(T)), false); - if (QTypeInfo<T>::isStatic) { + if (!QTypeInfo<T>::isRelocatable) { T *b = m_begin + m_size; T *i = m_begin + m_size + n; while (i != b) |