RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:07:35 +00:00
Code Issues Activity Actions

LibJS: Convert TypedArray create() functions to ThrowCompletionOr

Browse source
This commit is contained in:
Linus Groh 2021-11-14 12:03:22 +00:00
parent 878668efc9
commit 33ed87d642
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Libraries/LibJS/Runtime/TypedArray.cpp
View file

@ -366,10 +366,9 @@ void TypedArrayBase::visit_edges(Visitor& visitor)
} }
#define JS_DEFINE_TYPED_ARRAY(ClassName, snake_name, PrototypeName, ConstructorName, Type) \ #define JS_DEFINE_TYPED_ARRAY(ClassName, snake_name, PrototypeName, ConstructorName, Type) \
ClassName* ClassName::create(GlobalObject& global_object, u32 length, FunctionObject& new_target) \ ThrowCompletionOr<ClassName*> ClassName::create(GlobalObject& global_object, u32 length, FunctionObject& new_target) \
{ \ { \
auto* prototype = TRY_OR_DISCARD(get_prototype_from_constructor( \ auto* prototype = TRY(get_prototype_from_constructor(global_object, new_target, &GlobalObject::snake_name##_prototype)); \
global_object, new_target, &GlobalObject::snake_name##_prototype)); \
return global_object.heap().allocate<ClassName>(global_object, length, *prototype); \ return global_object.heap().allocate<ClassName>(global_object, length, *prototype); \
} \ } \
\ \
@ -441,13 +440,11 @@ void TypedArrayBase::visit_edges(Visitor& visitor)
{ \ { \
auto& vm = this->vm(); \ auto& vm = this->vm(); \
if (vm.argument_count() == 0) \ if (vm.argument_count() == 0) \
return ClassName::create(global_object(), 0, new_target); \ return TRY(ClassName::create(global_object(), 0, new_target)); \
\ \
auto first_argument = vm.argument(0); \ auto first_argument = vm.argument(0); \
if (first_argument.is_object()) { \ if (first_argument.is_object()) { \
auto* typed_array = ClassName::create(global_object(), 0, new_target); \ auto* typed_array = TRY(ClassName::create(global_object(), 0, new_target)); \
if (auto* exception = vm.exception()) \
return throw_completion(exception->value()); \
if (first_argument.as_object().is_typed_array()) { \ if (first_argument.as_object().is_typed_array()) { \
auto& arg_typed_array = static_cast<TypedArrayBase&>(first_argument.as_object()); \ auto& arg_typed_array = static_cast<TypedArrayBase&>(first_argument.as_object()); \
TRY(initialize_typed_array_from_typed_array(global_object(), *typed_array, arg_typed_array)); \ TRY(initialize_typed_array_from_typed_array(global_object(), *typed_array, arg_typed_array)); \
@ -485,7 +482,7 @@ void TypedArrayBase::visit_edges(Visitor& visitor)
/* FIXME: What is the best/correct behavior here? */ \ /* FIXME: What is the best/correct behavior here? */ \
if (Checked<u32>::multiplication_would_overflow(array_length, sizeof(Type))) \ if (Checked<u32>::multiplication_would_overflow(array_length, sizeof(Type))) \
return vm.throw_completion<RangeError>(global_object(), ErrorType::InvalidLength, "typed array"); \ return vm.throw_completion<RangeError>(global_object(), ErrorType::InvalidLength, "typed array"); \
return ClassName::create(global_object(), array_length, new_target); \ return TRY(ClassName::create(global_object(), array_length, new_target)); \
} }
#undef __JS_ENUMERATE #undef __JS_ENUMERATE

3
Userland/Libraries/LibJS/Runtime/TypedArray.h
View file

@ -477,7 +477,8 @@ ThrowCompletionOr<TypedArrayBase*> typed_array_create(GlobalObject& global_objec
\ \
public: \ public: \
virtual ~ClassName(); \ virtual ~ClassName(); \
static ClassName* create(GlobalObject&, u32 length, FunctionObject& new_target); \ static ThrowCompletionOr<ClassName*> create( \
GlobalObject&, u32 length, FunctionObject& new_target); \
static ClassName* create(GlobalObject&, u32 length); \ static ClassName* create(GlobalObject&, u32 length); \
ClassName(u32 length, Object& prototype); \ ClassName(u32 length, Object& prototype); \
virtual String element_name() const override; \ virtual String element_name() const override; \