mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-05 15:49:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

AK: Remove unused capacity field from StringData

Browse source 
This was added to be used with `kfree_sized` when we construct a String
from a StringBuilder. As of 53cac71cec, it
is unused, causing some compilers to raise a warning.

This reduces the size of StringData from 24 to 16 bytes.
This commit is contained in:
Timothy Flynn 2025-04-03 16:02:53 -04:00
commit a94db1e660
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
AK/StringData.h
View file

@ -30,7 +30,7 @@ public:
if (!slot) if (!slot)
return Error::from_errno(ENOMEM); return Error::from_errno(ENOMEM);
auto new_string_data = adopt_ref(*new (slot) StringData(byte_count, capacity)); auto new_string_data = adopt_ref(*new (slot) StringData(byte_count));
buffer = const_cast<u8*>(new_string_data->bytes().data()); buffer = const_cast<u8*>(new_string_data->bytes().data());
return new_string_data; return new_string_data;
} }
@ -43,7 +43,7 @@ public:
auto buffer = builder.leak_buffer_for_string_construction({}); auto buffer = builder.leak_buffer_for_string_construction({});
VERIFY(buffer.has_value()); // We should only arrive here if the buffer is outlined. VERIFY(buffer.has_value()); // We should only arrive here if the buffer is outlined.
return adopt_ref(*new (buffer->buffer.data()) StringData(byte_count, buffer->capacity)); return adopt_ref(*new (buffer->buffer.data()) StringData(byte_count));
} }
static ErrorOr<NonnullRefPtr<StringData>> create_substring(StringData const& superstring, size_t start, size_t byte_count) static ErrorOr<NonnullRefPtr<StringData>> create_substring(StringData const& superstring, size_t start, size_t byte_count)
@ -56,7 +56,7 @@ public:
if (!slot) if (!slot)
return Error::from_errno(ENOMEM); return Error::from_errno(ENOMEM);
return adopt_ref(*new (slot) StringData(superstring, start, byte_count, capacity)); return adopt_ref(*new (slot) StringData(superstring, start, byte_count));
} }
struct SubstringData { struct SubstringData {
@ -117,15 +117,13 @@ private:
return sizeof(StringData) + (sizeof(char) * length); return sizeof(StringData) + (sizeof(char) * length);
} }
StringData(size_t byte_count, size_t capacity) explicit StringData(size_t byte_count)
: m_byte_count(byte_count) : m_byte_count(byte_count)
, m_capacity(capacity)
{ {
} }
StringData(StringData const& superstring, size_t start, size_t byte_count, size_t capacity) StringData(StringData const& superstring, size_t start, size_t byte_count)
: m_byte_count(byte_count) : m_byte_count(byte_count)
, m_capacity(capacity)
, m_substring(true) , m_substring(true)
{ {
auto& data = const_cast<SubstringData&>(substring_data()); auto& data = const_cast<SubstringData&>(substring_data());
@ -145,7 +143,6 @@ private:
} }
u32 m_byte_count { 0 }; u32 m_byte_count { 0 };
u32 m_capacity { 0 };
mutable unsigned m_hash { 0 }; mutable unsigned m_hash { 0 };
mutable bool m_has_hash { false }; mutable bool m_has_hash { false };