RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:37:45 +00:00
Code Issues Activity Actions

LibJS+Everywhere: Make PrimitiveString and Utf16String fallible

Browse source 
This makes construction of Utf16String fallible in OOM conditions. The
immediate impact is that PrimitiveString must then be fallible as well,
as it may either transcode UTF-8 to UTF-16, or create a UTF-16 string
from ropes.

There are a couple of places where it is very non-trivial to propagate
the error further. A FIXME has been added to those locations.
This commit is contained in:
Timothy Flynn 2023-01-07 12:24:05 -05:00 • committed by Linus Groh
parent d793262beb
commit 115baa7e32
57 changed files with 306 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Userland/Libraries/LibJS/Runtime/PrimitiveString.h
View file

@ -8,9 +8,11 @@
#pragma once
#include <AK/DeprecatedString.h>
#include <AK/Optional.h>
#include <AK/StringView.h>
#include <LibJS/Forward.h>
#include <LibJS/Heap/Cell.h>
#include <LibJS/Runtime/Completion.h>
#include <LibJS/Runtime/Utf16String.h>
#include <LibJS/Runtime/Value.h>
@ -20,7 +22,6 @@ class PrimitiveString final : public Cell {
JS_CELL(PrimitiveString, Cell);
public:
[[nodiscard]] static NonnullGCPtr<PrimitiveString> create(VM&, Utf16View const&);
[[nodiscard]] static NonnullGCPtr<PrimitiveString> create(VM&, Utf16String);
[[nodiscard]] static NonnullGCPtr<PrimitiveString> create(VM&, DeprecatedString);
[[nodiscard]] static NonnullGCPtr<PrimitiveString> create(VM&, PrimitiveString&, PrimitiveString&);
@ -31,15 +32,16 @@ public:
PrimitiveString& operator=(PrimitiveString const&) = delete;
bool is_empty() const;
u32 hash() const;
DeprecatedString const& deprecated_string() const;
bool has_utf8_string() const { return m_has_utf8_string; }
ThrowCompletionOr<DeprecatedString const&> deprecated_string() const;
bool has_utf8_string() const { return m_utf8_string.has_value(); }
Utf16String const& utf16_string() const;
Utf16View utf16_string_view() const;
bool has_utf16_string() const { return m_has_utf16_string; }
ThrowCompletionOr<Utf16String const&> utf16_string() const;
ThrowCompletionOr<Utf16View> utf16_string_view() const;
bool has_utf16_string() const { return m_utf16_string.has_value(); }
Optional<Value> get(VM&, PropertyKey const&) const;
ThrowCompletionOr<Optional<Value>> get(VM&, PropertyKey const&) const;
private:
explicit PrimitiveString(PrimitiveString&, PrimitiveString&);
@ -48,18 +50,15 @@ private:
virtual void visit_edges(Cell::Visitor&) override;
void resolve_rope_if_needed() const;
ThrowCompletionOr<void> resolve_rope_if_needed() const;
mutable bool m_is_rope { false };
mutable bool m_has_utf8_string { false };
mutable bool m_has_utf16_string { false };
mutable PrimitiveString* m_lhs { nullptr };
mutable PrimitiveString* m_rhs { nullptr };
mutable DeprecatedString m_utf8_string;
mutable Utf16String m_utf16_string;
mutable Optional<DeprecatedString> m_utf8_string;
mutable Optional<Utf16String> m_utf16_string;
};
}