feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: remove a copy from the SmallString default constructor

Browse Source 
StringDataLayout() is now constexpr too. Not that is useful because we
have to wait for constexpr new.

Change-Id: I34982c8b17e1935de5c65ec6fc1b01b572170966
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2023-08-20 14:26:58 +02:00
parent 1be5475f62
commit 4c52e5ef95
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/smallstring.h
View File

@@ -50,15 +50,11 @@ public:
using const_reverse_iterator = std::reverse_iterator<const_iterator>; using const_reverse_iterator = std::reverse_iterator<const_iterator>;
using size_type = std::size_t; using size_type = std::size_t;
static_assert(Size < 64 static_assert(Size < 64 ? sizeof(Internal::StringDataLayout<Size>) == Size + 1
? sizeof(Internal::StringDataLayout<Size>) == Size + 1 : sizeof(Internal::StringDataLayout<Size>) == Size + 2,
: sizeof(Internal::StringDataLayout<Size>) == Size + 2,
"Size is wrong"); "Size is wrong");
constexpr
BasicSmallString() noexcept constexpr BasicSmallString() = default;
: m_data(Internal::StringDataLayout<Size>())
{
}
constexpr constexpr
BasicSmallString(const BasicSmallStringLiteral<Size> &stringReference) BasicSmallString(const BasicSmallStringLiteral<Size> &stringReference)

4
src/libs/utils/smallstringlayout.h
View File

@@ -95,7 +95,7 @@ struct alignas(16) StringDataLayout
"Size + 1 must be dividable by 16 if under 64 and Size + 2 must be dividable by " "Size + 1 must be dividable by 16 if under 64 and Size + 2 must be dividable by "
"16 if over 64!"); "16 if over 64!");
StringDataLayout() noexcept { reset(); } constexpr StringDataLayout() noexcept { reset(); }
constexpr StringDataLayout(const char *string, size_type size) noexcept constexpr StringDataLayout(const char *string, size_type size) noexcept
: control{0, true, true} : control{0, true, true}
@@ -147,7 +147,7 @@ struct alignas(16) StringDataLayout<MaximumShortStringDataAreaSize,
"Size + 1 must be dividable by 16 if under 64 and Size + 2 must be dividable by " "Size + 1 must be dividable by 16 if under 64 and Size + 2 must be dividable by "
"16 if over 64!"); "16 if over 64!");
StringDataLayout() noexcept { reset(); } constexpr StringDataLayout() noexcept { reset(); }
constexpr StringDataLayout(const char *string, size_type size) noexcept constexpr StringDataLayout(const char *string, size_type size) noexcept
: control{0, true, true} : control{0, true, true}