mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 09:51:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Revert "AK: Fix accidentally-quadratic behavior in StringBuilder"

Browse source 
This reverts commit 2d011961c9.
This commit is contained in:
Ben Wiederhake 2021-05-30 21:24:33 +02:00 • committed by Linus Groh
parent 05d49cc0cb
commit dfd988707c
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
AK/ByteBuffer.h
View file

@ -187,8 +187,6 @@ public:
operator Bytes() { return bytes(); }
operator ReadonlyBytes() const { return bytes(); }
ALWAYS_INLINE size_t capacity() const { return is_inline() ? inline_capacity : m_outline_capacity; }
private:
ByteBuffer(size_t size)
{
@ -238,6 +236,7 @@ private:
}
ALWAYS_INLINE bool is_inline() const { return m_size <= inline_capacity; }
ALWAYS_INLINE size_t capacity() const { return is_inline() ? inline_capacity : m_outline_capacity; }
size_t m_size { 0 };
union {

7
AK/StringBuilder.cpp
View file

@ -21,11 +21,10 @@ inline void StringBuilder::will_append(size_t size)
Checked<size_t> needed_capacity = m_length;
needed_capacity += size;
VERIFY(!needed_capacity.has_overflow());
if (needed_capacity <= m_buffer.capacity())
return;
Checked<size_t> expanded_capacity = needed_capacity;
expanded_capacity *= 2;
// Prefer to completely use the inline buffer first
if (needed_capacity > inline_capacity)
expanded_capacity *= 2;
VERIFY(!expanded_capacity.has_overflow());
m_buffer.grow(expanded_capacity.value());
}