From c7c914800c67754e4187f4ae0b848a1afd16ac63 Mon Sep 17 00:00:00 2001 From: Idan Horowitz Date: Sun, 31 Oct 2021 16:56:21 +0200 Subject: LibWeb: Convert WebAssemblyInstancePrototype funcs to ThrowCompletionOr --- .../WebAssembly/WebAssemblyInstanceObjectPrototype.cpp | 12 +++++------- .../LibWeb/WebAssembly/WebAssemblyInstanceObjectPrototype.h | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'Userland/Libraries/LibWeb/WebAssembly') diff --git a/Userland/Libraries/LibWeb/WebAssembly/WebAssemblyInstanceObjectPrototype.cpp b/Userland/Libraries/LibWeb/WebAssembly/WebAssemblyInstanceObjectPrototype.cpp index 4688a4b256..1f05165f9d 100644 --- a/Userland/Libraries/LibWeb/WebAssembly/WebAssemblyInstanceObjectPrototype.cpp +++ b/Userland/Libraries/LibWeb/WebAssembly/WebAssemblyInstanceObjectPrototype.cpp @@ -13,17 +13,15 @@ namespace Web::Bindings { void WebAssemblyInstancePrototype::initialize(JS::GlobalObject& global_object) { Object::initialize(global_object); - define_old_native_accessor("exports", exports_getter, {}, JS::Attribute::Enumerable | JS::Attribute::Configurable); + define_native_accessor("exports", exports_getter, {}, JS::Attribute::Enumerable | JS::Attribute::Configurable); } -JS_DEFINE_OLD_NATIVE_FUNCTION(WebAssemblyInstancePrototype::exports_getter) +JS_DEFINE_NATIVE_FUNCTION(WebAssemblyInstancePrototype::exports_getter) { auto this_value = vm.this_value(global_object); - auto* this_object = TRY_OR_DISCARD(this_value.to_object(global_object)); - if (!is(this_object)) { - vm.throw_exception(global_object, JS::ErrorType::NotAnObjectOfType, "WebAssembly.Instance"); - return {}; - } + auto* this_object = TRY(this_value.to_object(global_object)); + if (!is(this_object)) + return vm.throw_completion(global_object, JS::ErrorType::NotAnObjectOfType, "WebAssembly.Instance"); auto object = static_cast(this_object); return object->m_exports_object; } diff --git a/Userland/Libraries/LibWeb/WebAssembly/WebAssemblyInstanceObjectPrototype.h b/Userland/Libraries/LibWeb/WebAssembly/WebAssemblyInstanceObjectPrototype.h index 4417787135..fff25310e1 100644 --- a/Userland/Libraries/LibWeb/WebAssembly/WebAssemblyInstanceObjectPrototype.h +++ b/Userland/Libraries/LibWeb/WebAssembly/WebAssemblyInstanceObjectPrototype.h @@ -25,7 +25,7 @@ public: virtual void initialize(JS::GlobalObject&) override; private: - JS_DECLARE_OLD_NATIVE_FUNCTION(exports_getter); + JS_DECLARE_NATIVE_FUNCTION(exports_getter); static JS::Handle s_instance; }; -- cgit v1.2.3