1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shuffle Q_(ALWAYS|NEVER)_INLINE around so they can be attributes

Browse Source 
The attribute must appear before the modifiers like 'inline' and 'constexpr'.

Change-Id: If3d143fc2f85a8eba6e3ac2ceca10720649f33cb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Mårten Nordheim 2025-03-21 14:52:43 +01:00
parent d2d74673f3
commit 2a7fa4963c
18 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qendian.cpp
View File

@ -835,7 +835,7 @@ size_t simdSwapLoop(const uchar *, size_t, uchar *) noexcept
} }
#endif #endif
template <typename T> static Q_ALWAYS_INLINE template <typename T> Q_ALWAYS_INLINE static
void *bswapLoop(const uchar *src, size_t n, uchar *dst) noexcept void *bswapLoop(const uchar *src, size_t n, uchar *dst) noexcept
{ {
// Buffers cannot partially overlap: either they're identical or totally // Buffers cannot partially overlap: either they're identical or totally

4
src/corelib/kernel/qproperty_p.h
View File

@ -81,7 +81,7 @@ struct QPropertyBindingDataPointer
d = reinterpret_cast<quintptr>(observer); d = reinterpret_cast<quintptr>(observer);
} }
static void fixupAfterMove(QtPrivate::QPropertyBindingData *ptr); static void fixupAfterMove(QtPrivate::QPropertyBindingData *ptr);
void Q_ALWAYS_INLINE addObserver(QPropertyObserver *observer); Q_ALWAYS_INLINE void addObserver(QPropertyObserver *observer);
inline void setFirstObserver(QPropertyObserver *observer); inline void setFirstObserver(QPropertyObserver *observer);
inline QPropertyObserverPointer firstObserver() const; inline QPropertyObserverPointer firstObserver() const;
static QPropertyProxyBindingData *proxyData(QtPrivate::QPropertyBindingData *ptr); static QPropertyProxyBindingData *proxyData(QtPrivate::QPropertyBindingData *ptr);
@ -399,7 +399,7 @@ public:
bool evaluateRecursive(PendingBindingObserverList &bindingObservers, QBindingStatus *status = nullptr); bool evaluateRecursive(PendingBindingObserverList &bindingObservers, QBindingStatus *status = nullptr);
bool Q_ALWAYS_INLINE evaluateRecursive_inline(PendingBindingObserverList &bindingObservers, QBindingStatus *status); Q_ALWAYS_INLINE bool evaluateRecursive_inline(PendingBindingObserverList &bindingObservers, QBindingStatus *status);
void notifyNonRecursive(const PendingBindingObserverList &bindingObservers); void notifyNonRecursive(const PendingBindingObserverList &bindingObservers);
enum NotificationState : bool { Delayed, Sent }; enum NotificationState : bool { Delayed, Sent };

2
src/corelib/serialization/qjsoncbor.cpp
View File

@ -107,7 +107,7 @@ static QString encodeTag(const QCborContainerPrivate *d)
return s; return s;
} }
static Q_NEVER_INLINE QString makeString(const QCborContainerPrivate *d, qsizetype idx, Q_NEVER_INLINE static QString makeString(const QCborContainerPrivate *d, qsizetype idx,
ConversionMode mode) ConversionMode mode)
{ {
const auto &e = d->elements.at(idx); const auto &e = d->elements.at(idx);

2
src/corelib/text/qanystringview.h
View File

@ -200,7 +200,7 @@ public:
inline constexpr QAnyStringView(QLatin1StringView str) noexcept; inline constexpr QAnyStringView(QLatin1StringView str) noexcept;
template <typename Container, if_compatible_container<Container> = true> template <typename Container, if_compatible_container<Container> = true>
constexpr Q_ALWAYS_INLINE QAnyStringView(const Container &c) noexcept Q_ALWAYS_INLINE constexpr QAnyStringView(const Container &c) noexcept
: QAnyStringView(std::data(c), QtPrivate::lengthHelperContainer(c)) {} : QAnyStringView(std::data(c), QtPrivate::lengthHelperContainer(c)) {}
template <typename Container, if_convertible_to<QString, Container> = true> template <typename Container, if_convertible_to<QString, Container> = true>

2
src/corelib/text/qlocale_tools.cpp
View File

@ -474,7 +474,7 @@ QSimpleParsedNumber<qlonglong> qstrntoll(const char *begin, qsizetype size, int
} }
template <typename Char> template <typename Char>
static Q_ALWAYS_INLINE void qulltoString_helper(qulonglong number, int base, Char *&p) Q_ALWAYS_INLINE static void qulltoString_helper(qulonglong number, int base, Char *&p)
{ {
// Performance-optimized code. Compiler can generate faster code when base is known. // Performance-optimized code. Compiler can generate faster code when base is known.
switch (base) { switch (base) {

2
src/corelib/text/qstring.cpp
View File

@ -372,7 +372,7 @@ static constexpr bool UseAvx2 = UseSse4_1 &&
(qCompilerCpuFeatures & CpuFeatureArchHaswell) == CpuFeatureArchHaswell; (qCompilerCpuFeatures & CpuFeatureArchHaswell) == CpuFeatureArchHaswell;
[[maybe_unused]] [[maybe_unused]]
static Q_ALWAYS_INLINE __m128i mm_load8_zero_extend(const void *ptr) Q_ALWAYS_INLINE static __m128i mm_load8_zero_extend(const void *ptr)
{ {
const __m128i *dataptr = static_cast<const __m128i *>(ptr); const __m128i *dataptr = static_cast<const __m128i *>(ptr);
if constexpr (UseSse4_1) { if constexpr (UseSse4_1) {

4
src/corelib/text/qstringalgorithms.h
View File

@ -129,7 +129,7 @@ namespace QtPrivate {
[[nodiscard]] Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool isLatin1(QStringView s) noexcept; [[nodiscard]] Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool isLatin1(QStringView s) noexcept;
[[nodiscard]] Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool isValidUtf16(QStringView s) noexcept; [[nodiscard]] Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool isValidUtf16(QStringView s) noexcept;
template <typename Char, size_t N> [[nodiscard]] constexpr Q_ALWAYS_INLINE template <typename Char, size_t N> [[nodiscard]] Q_ALWAYS_INLINE constexpr
qsizetype lengthHelperContainerLoop(const Char (&str)[N]) qsizetype lengthHelperContainerLoop(const Char (&str)[N])
{ {
#if defined(__cpp_lib_constexpr_algorithms) && defined(Q_CC_GNU_ONLY) #if defined(__cpp_lib_constexpr_algorithms) && defined(Q_CC_GNU_ONLY)
@ -148,7 +148,7 @@ qsizetype lengthHelperContainerLoop(const Char (&str)[N])
#endif #endif
} }
template <typename Char, size_t N> [[nodiscard]] constexpr Q_ALWAYS_INLINE template <typename Char, size_t N> [[nodiscard]] Q_ALWAYS_INLINE constexpr
std::enable_if_t<sizeof(Char) == sizeof(char16_t), qsizetype> std::enable_if_t<sizeof(Char) == sizeof(char16_t), qsizetype>
lengthHelperContainer(const Char (&str)[N]) lengthHelperContainer(const Char (&str)[N])
{ {

6
src/corelib/text/qstringconverter.cpp
View File

@ -64,7 +64,7 @@ enum { Endian = 0, Data = 1 };
static const uchar utf8bom[] = { 0xef, 0xbb, 0xbf }; static const uchar utf8bom[] = { 0xef, 0xbb, 0xbf };
#if defined(__SSE2__) || defined(__ARM_NEON__) #if defined(__SSE2__) || defined(__ARM_NEON__)
static Q_ALWAYS_INLINE uint qBitScanReverse(unsigned v) noexcept Q_ALWAYS_INLINE static uint qBitScanReverse(unsigned v) noexcept
{ {
#if defined(__cpp_lib_int_pow2) && __cpp_lib_int_pow2 >= 202002L #if defined(__cpp_lib_int_pow2) && __cpp_lib_int_pow2 >= 202002L
return std::bit_width(v) - 1; return std::bit_width(v) - 1;
@ -80,7 +80,7 @@ static Q_ALWAYS_INLINE uint qBitScanReverse(unsigned v) noexcept
#endif #endif
#if defined(__SSE2__) #if defined(__SSE2__)
template <QCpuFeatureType Cpu = _compilerCpuFeatures> static Q_ALWAYS_INLINE bool template <QCpuFeatureType Cpu = _compilerCpuFeatures> Q_ALWAYS_INLINE static bool
simdEncodeAscii(uchar *&dst, const char16_t *&nextAscii, const char16_t *&src, const char16_t *end) simdEncodeAscii(uchar *&dst, const char16_t *&nextAscii, const char16_t *&src, const char16_t *end)
{ {
size_t sizeBytes = reinterpret_cast<const char *>(end) - reinterpret_cast<const char *>(src); size_t sizeBytes = reinterpret_cast<const char *>(end) - reinterpret_cast<const char *>(src);
@ -247,7 +247,7 @@ simdEncodeAscii(uchar *&dst, const char16_t *&nextAscii, const char16_t *&src, c
return src == end; return src == end;
} }
template <QCpuFeatureType Cpu = _compilerCpuFeatures> static Q_ALWAYS_INLINE bool template <QCpuFeatureType Cpu = _compilerCpuFeatures> Q_ALWAYS_INLINE static bool
simdDecodeAscii(char16_t *&dst, const uchar *&nextAscii, const uchar *&src, const uchar *end) simdDecodeAscii(char16_t *&dst, const uchar *&nextAscii, const uchar *&src, const uchar *end)
{ {
// do sixteen characters at a time // do sixteen characters at a time

2
src/corelib/text/qstringliteral.h
View File

@ -25,7 +25,7 @@ using QStringPrivate = QArrayDataPointer<char16_t>;
namespace QtPrivate { namespace QtPrivate {
template <qsizetype N> template <qsizetype N>
static Q_ALWAYS_INLINE QStringPrivate qMakeStringPrivate(const char16_t (&literal)[N]) Q_ALWAYS_INLINE static QStringPrivate qMakeStringPrivate(const char16_t (&literal)[N])
{ {
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-const-cast) // NOLINTNEXTLINE(cppcoreguidelines-pro-type-const-cast)
auto str = const_cast<char16_t *>(literal); auto str = const_cast<char16_t *>(literal);

2
src/corelib/text/qstringview.h
View File

@ -166,7 +166,7 @@ public:
#endif #endif
template <typename Container, if_compatible_container<Container> = true> template <typename Container, if_compatible_container<Container> = true>
constexpr Q_ALWAYS_INLINE QStringView(const Container &c) noexcept Q_ALWAYS_INLINE constexpr QStringView(const Container &c) noexcept
: QStringView(std::data(c), QtPrivate::lengthHelperContainer(c)) {} : QStringView(std::data(c), QtPrivate::lengthHelperContainer(c)) {}
template <typename Char, size_t Size, if_compatible_char<Char> = true> template <typename Char, size_t Size, if_compatible_char<Char> = true>

3
src/corelib/thread/qyieldcpu.h
View File

@ -21,10 +21,11 @@ void _mm_pause(void); // the compiler recognizes as intrinsic
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
Q_ALWAYS_INLINE
#ifdef Q_CC_GNU #ifdef Q_CC_GNU
__attribute__((artificial)) __attribute__((artificial))
#endif #endif
Q_ALWAYS_INLINE void qYieldCpu(void) Q_DECL_NOEXCEPT; void qYieldCpu(void) Q_DECL_NOEXCEPT;
void qYieldCpu(void) void qYieldCpu(void)
#ifdef __cplusplus #ifdef __cplusplus

6
src/corelib/tools/qbitarray.cpp
View File

@ -545,7 +545,7 @@ static QBitArray sizedForOverwrite(const QBitArray &a1, const QBitArray &a2)
return result; return result;
} }
template <typename BitwiseOp> static Q_NEVER_INLINE template <typename BitwiseOp> Q_NEVER_INLINE static
QBitArray &performBitwiseOperationHelper(QBitArray &out, const QBitArray &a1, QBitArray &performBitwiseOperationHelper(QBitArray &out, const QBitArray &a1,
const QBitArray &a2, BitwiseOp op) const QBitArray &a2, BitwiseOp op)
{ {
@ -581,7 +581,7 @@ QBitArray &performBitwiseOperationHelper(QBitArray &out, const QBitArray &a1,
return out; return out;
} }
template <typename BitwiseOp> static Q_NEVER_INLINE template <typename BitwiseOp> Q_NEVER_INLINE static
QBitArray &performBitwiseOperationInCopy(QBitArray &self, const QBitArray &other, BitwiseOp op) QBitArray &performBitwiseOperationInCopy(QBitArray &self, const QBitArray &other, BitwiseOp op)
{ {
QBitArray tmp(std::move(self)); QBitArray tmp(std::move(self));
@ -589,7 +589,7 @@ QBitArray &performBitwiseOperationInCopy(QBitArray &self, const QBitArray &other
return performBitwiseOperationHelper(self, tmp, other, op); return performBitwiseOperationHelper(self, tmp, other, op);
} }
template <typename BitwiseOp> static Q_NEVER_INLINE template <typename BitwiseOp> Q_NEVER_INLINE static
QBitArray &performBitwiseOperationInPlace(QBitArray &self, const QBitArray &other, BitwiseOp op) QBitArray &performBitwiseOperationInPlace(QBitArray &self, const QBitArray &other, BitwiseOp op)
{ {
if (self.size() < other.size()) if (self.size() < other.size())

4
src/corelib/tools/qhash.cpp
View File

@ -106,7 +106,7 @@ struct HashSeedStorage
} }
private: private:
Q_DECL_COLD_FUNCTION Q_NEVER_INLINE StateResult initialize(int which) noexcept; Q_NEVER_INLINE Q_DECL_COLD_FUNCTION StateResult initialize(int which) noexcept;
}; };
[[maybe_unused]] HashSeedStorage::StateResult HashSeedStorage::initialize(int which) noexcept [[maybe_unused]] HashSeedStorage::StateResult HashSeedStorage::initialize(int which) noexcept
@ -413,7 +413,7 @@ namespace {
} }
// hash 16 bytes, running 3 scramble rounds of AES on itself (like label "final1") // hash 16 bytes, running 3 scramble rounds of AES on itself (like label "final1")
static void Q_ALWAYS_INLINE QT_FUNCTION_TARGET(AES) QT_VECTORCALL Q_ALWAYS_INLINE static void QT_FUNCTION_TARGET(AES) QT_VECTORCALL
hash16bytes(__m128i &state0, __m128i data) hash16bytes(__m128i &state0, __m128i data)
{ {
state0 = _mm_xor_si128(state0, data); state0 = _mm_xor_si128(state0, data);

2
src/gui/painting/qdrawhelper_avx2.cpp
View File

@ -287,7 +287,7 @@ void qt_blend_rgb32_on_rgb32_avx2(uchar *destPixels, int dbpl,
} }
} }
static Q_NEVER_INLINE Q_NEVER_INLINE static
void Q_DECL_VECTORCALL qt_memfillXX_avx2(uchar *dest, __m256i value256, qsizetype bytes) void Q_DECL_VECTORCALL qt_memfillXX_avx2(uchar *dest, __m256i value256, qsizetype bytes)
{ {
__m128i value128 = _mm256_castsi256_si128(value256); __m128i value128 = _mm256_castsi256_si128(value256);

2
src/gui/painting/qdrawhelper_sse2.cpp
View File

@ -198,7 +198,7 @@ void QT_FASTCALL comp_func_Source_sse2(uint *dst, const uint *src, int length, u
} }
#ifndef __haswell__ #ifndef __haswell__
static Q_NEVER_INLINE Q_NEVER_INLINE static
void Q_DECL_VECTORCALL qt_memfillXX_aligned(void *dest, __m128i value128, quintptr bytecount) void Q_DECL_VECTORCALL qt_memfillXX_aligned(void *dest, __m128i value128, quintptr bytecount)
{ {
__m128i *dst128 = reinterpret_cast<__m128i *>(dest); __m128i *dst128 = reinterpret_cast<__m128i *>(dest);

4
src/gui/painting/qpixellayout.cpp
View File

@ -368,7 +368,7 @@ static const QRgba64 *QT_FASTCALL fetchRGBToRGB64(QRgba64 *buffer, const uchar *
} }
template<QImage::Format Format> template<QImage::Format Format>
static Q_ALWAYS_INLINE QRgbaFloat32 convertPixelToRGB32F(uint s) Q_ALWAYS_INLINE static QRgbaFloat32 convertPixelToRGB32F(uint s)
{ {
return QRgbaFloat32::fromArgb32(convertPixelToRGB32<Format>(s)); return QRgbaFloat32::fromArgb32(convertPixelToRGB32<Format>(s));
} }
@ -481,7 +481,7 @@ static const QRgba64 *QT_FASTCALL fetchARGBPMToRGBA64PM(QRgba64 *buffer, const u
} }
template<QImage::Format Format> template<QImage::Format Format>
static Q_ALWAYS_INLINE QRgbaFloat32 convertPixelToRGBA32F(uint s) Q_ALWAYS_INLINE static QRgbaFloat32 convertPixelToRGBA32F(uint s)
{ {
return QRgbaFloat32::fromArgb32(convertPixelToARGB32PM<Format>(s)); return QRgbaFloat32::fromArgb32(convertPixelToARGB32PM<Format>(s));
} }

12
src/gui/painting/qrgba64.h
View File

@ -28,7 +28,7 @@ class QRgba64 {
#endif #endif
}; };
explicit Q_ALWAYS_INLINE constexpr QRgba64(quint64 c) : rgba(c) { } Q_ALWAYS_INLINE explicit constexpr QRgba64(quint64 c) : rgba(c) { }
public: public:
QRgba64() = default; QRgba64() = default;
@ -148,11 +148,11 @@ public:
} }
private: private:
static constexpr Q_ALWAYS_INLINE quint64 alphaMask() { return Q_UINT64_C(0xffff) << AlphaShift; } Q_ALWAYS_INLINE static constexpr quint64 alphaMask() { return Q_UINT64_C(0xffff) << AlphaShift; }
static constexpr Q_ALWAYS_INLINE quint8 div_257_floor(uint x) { return quint8((x - (x >> 8)) >> 8); } Q_ALWAYS_INLINE static constexpr quint8 div_257_floor(uint x) { return quint8((x - (x >> 8)) >> 8); }
static constexpr Q_ALWAYS_INLINE quint8 div_257(quint16 x) { return div_257_floor(x + 128U); } Q_ALWAYS_INLINE static constexpr quint8 div_257(quint16 x) { return div_257_floor(x + 128U); }
constexpr Q_ALWAYS_INLINE QRgba64 unpremultiplied_32bit() const Q_ALWAYS_INLINE constexpr QRgba64 unpremultiplied_32bit() const
{ {
if (isOpaque() || isTransparent()) if (isOpaque() || isTransparent())
return *this; return *this;
@ -162,7 +162,7 @@ private:
const quint16 b = quint16((blue() * 0xffff + a/2) / a); const quint16 b = quint16((blue() * 0xffff + a/2) / a);
return fromRgba64(r, g, b, quint16(a)); return fromRgba64(r, g, b, quint16(a));
} }
constexpr Q_ALWAYS_INLINE QRgba64 unpremultiplied_64bit() const Q_ALWAYS_INLINE constexpr QRgba64 unpremultiplied_64bit() const
{ {
if (isOpaque() || isTransparent()) if (isOpaque() || isTransparent())
return *this; return *this;

4
src/gui/painting/qrgbafloat.h
View File

@ -89,11 +89,11 @@ public:
constexpr quint16 blue16() const { return qRound(blueNormalized() * FastType(65535.0f)); } constexpr quint16 blue16() const { return qRound(blueNormalized() * FastType(65535.0f)); }
constexpr quint16 alpha16() const { return qRound(alphaNormalized() * FastType(65535.0f)); } constexpr quint16 alpha16() const { return qRound(alphaNormalized() * FastType(65535.0f)); }
constexpr Q_ALWAYS_INLINE QRgbaFloat premultiplied() const Q_ALWAYS_INLINE constexpr QRgbaFloat premultiplied() const
{ {
return QRgbaFloat{r * a, g * a, b * a, a}; return QRgbaFloat{r * a, g * a, b * a, a};
} }
constexpr Q_ALWAYS_INLINE QRgbaFloat unpremultiplied() const Q_ALWAYS_INLINE constexpr QRgbaFloat unpremultiplied() const
{ {
if (a <= F{0.0f}) if (a <= F{0.0f})
return QRgbaFloat{}; // default-initialization: zeroes return QRgbaFloat{}; // default-initialization: zeroes