diff --git a/Libraries/LibJS/Runtime/VM.cpp b/Libraries/LibJS/Runtime/VM.cpp index da24a99306a..b1739c03c3e 100644 --- a/Libraries/LibJS/Runtime/VM.cpp +++ b/Libraries/LibJS/Runtime/VM.cpp @@ -37,7 +37,7 @@ namespace JS { -ErrorOr> VM::create(OwnPtr agent) +NonnullRefPtr VM::create(OwnPtr agent) { ErrorMessages error_messages {}; error_messages[to_underlying(ErrorMessage::OutOfMemory)] = ErrorType::OutOfMemory.message(); diff --git a/Libraries/LibJS/Runtime/VM.h b/Libraries/LibJS/Runtime/VM.h index fa547f39dd4..adc87b37937 100644 --- a/Libraries/LibJS/Runtime/VM.h +++ b/Libraries/LibJS/Runtime/VM.h @@ -47,7 +47,7 @@ enum class EvalMode { class VM : public RefCounted { public: - static ErrorOr> create(OwnPtr = {}); + static NonnullRefPtr create(OwnPtr = {}); ~VM(); GC::Heap& heap() { return m_heap; } diff --git a/Libraries/LibTest/JavaScriptTestRunnerMain.cpp b/Libraries/LibTest/JavaScriptTestRunnerMain.cpp index bbe276a6098..0b52080efaf 100644 --- a/Libraries/LibTest/JavaScriptTestRunnerMain.cpp +++ b/Libraries/LibTest/JavaScriptTestRunnerMain.cpp @@ -183,7 +183,7 @@ int main(int argc, char** argv) g_main_hook(); if (!g_vm) { - g_vm = MUST(JS::VM::create()); + g_vm = JS::VM::create(); g_vm->set_dynamic_imports_allowed(true); } diff --git a/Libraries/LibWeb/Bindings/MainThreadVM.cpp b/Libraries/LibWeb/Bindings/MainThreadVM.cpp index 7cafd1a7b7f..650c9bfe149 100644 --- a/Libraries/LibWeb/Bindings/MainThreadVM.cpp +++ b/Libraries/LibWeb/Bindings/MainThreadVM.cpp @@ -72,11 +72,11 @@ HTML::Script* active_script() }); } -ErrorOr initialize_main_thread_vm(HTML::EventLoop::Type type) +void initialize_main_thread_vm(HTML::EventLoop::Type type) { VERIFY(!s_main_thread_vm); - s_main_thread_vm = TRY(JS::VM::create(make())); + s_main_thread_vm = JS::VM::create(make()); auto& agent = as(*s_main_thread_vm->agent()); agent.event_loop = s_main_thread_vm->heap().allocate(type); @@ -645,8 +645,6 @@ ErrorOr initialize_main_thread_vm(HTML::EventLoop::Type type) s_main_thread_vm->host_unrecognized_date_string = [](StringView date) { dbgln("Unable to parse date string: \"{}\"", date); }; - - return {}; } JS::VM& main_thread_vm() diff --git a/Libraries/LibWeb/Bindings/MainThreadVM.h b/Libraries/LibWeb/Bindings/MainThreadVM.h index 3e7c9a5780e..364900207a2 100644 --- a/Libraries/LibWeb/Bindings/MainThreadVM.h +++ b/Libraries/LibWeb/Bindings/MainThreadVM.h @@ -32,7 +32,7 @@ struct WebEngineCustomJobCallbackData final : public JS::JobCallback::CustomData HTML::Script* active_script(); -ErrorOr initialize_main_thread_vm(HTML::EventLoop::Type); +void initialize_main_thread_vm(HTML::EventLoop::Type); JS::VM& main_thread_vm(); void queue_mutation_observer_microtask(DOM::Document const&); diff --git a/Meta/Lagom/Fuzzers/FuzzCSSParser.cpp b/Meta/Lagom/Fuzzers/FuzzCSSParser.cpp index d24c6311841..bd3cabc2928 100644 --- a/Meta/Lagom/Fuzzers/FuzzCSSParser.cpp +++ b/Meta/Lagom/Fuzzers/FuzzCSSParser.cpp @@ -17,7 +17,7 @@ struct Globals { Globals::Globals() { Web::Platform::EventLoopPlugin::install(*new Web::Platform::EventLoopPluginSerenity); - MUST(Web::Bindings::initialize_main_thread_vm(Web::HTML::EventLoop::Type::Window)); + Web::Bindings::initialize_main_thread_vm(Web::HTML::EventLoop::Type::Window); } } diff --git a/Meta/Lagom/Fuzzers/FuzzJs.cpp b/Meta/Lagom/Fuzzers/FuzzJs.cpp index 8949d579cef..a245e482075 100644 --- a/Meta/Lagom/Fuzzers/FuzzJs.cpp +++ b/Meta/Lagom/Fuzzers/FuzzJs.cpp @@ -19,7 +19,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* data, size_t size) // FIXME: https://github.com/SerenityOS/serenity/issues/17899 if (!Utf8View(js).validate()) return 0; - auto vm = MUST(JS::VM::create()); + auto vm = JS::VM::create(); auto root_execution_context = JS::create_simple_execution_context(*vm); auto& realm = *root_execution_context->realm; auto parse_result = JS::Script::parse(js, realm); diff --git a/Meta/Lagom/Fuzzers/FuzzilliJs.cpp b/Meta/Lagom/Fuzzers/FuzzilliJs.cpp index 9c3ef8daa57..c8526c84195 100644 --- a/Meta/Lagom/Fuzzers/FuzzilliJs.cpp +++ b/Meta/Lagom/Fuzzers/FuzzilliJs.cpp @@ -194,7 +194,7 @@ int main(int, char**) reprl_input = (char*)mmap(0, REPRL_MAX_DATA_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, REPRL_DRFD, 0); VERIFY(reprl_input != MAP_FAILED); - auto vm = MUST(JS::VM::create()); + auto vm = JS::VM::create(); auto root_execution_context = JS::create_simple_execution_context(*vm); auto& realm = *root_execution_context->realm; diff --git a/Services/WebContent/main.cpp b/Services/WebContent/main.cpp index cabe2e7d512..a5ef5ebe275 100644 --- a/Services/WebContent/main.cpp +++ b/Services/WebContent/main.cpp @@ -191,7 +191,7 @@ ErrorOr serenity_main(Main::Arguments arguments) Web::Platform::FontPlugin::install(*new WebView::FontPlugin(is_layout_test_mode, &font_provider)); - TRY(Web::Bindings::initialize_main_thread_vm(Web::HTML::EventLoop::Type::Window)); + Web::Bindings::initialize_main_thread_vm(Web::HTML::EventLoop::Type::Window); if (collect_garbage_on_every_allocation) Web::Bindings::main_thread_vm().heap().set_should_collect_on_every_allocation(true); diff --git a/Services/WebWorker/main.cpp b/Services/WebWorker/main.cpp index 6ad9a7b58f4..42376637174 100644 --- a/Services/WebWorker/main.cpp +++ b/Services/WebWorker/main.cpp @@ -68,7 +68,7 @@ ErrorOr serenity_main(Main::Arguments arguments) Web::Platform::FontPlugin::install(*new WebView::FontPlugin(false)); - TRY(Web::Bindings::initialize_main_thread_vm(Web::HTML::EventLoop::Type::Worker)); + Web::Bindings::initialize_main_thread_vm(Web::HTML::EventLoop::Type::Worker); TRY(initialize_resource_loader(Web::Bindings::main_thread_vm().heap(), request_server_socket)); diff --git a/Tests/LibJS/test262-runner.cpp b/Tests/LibJS/test262-runner.cpp index a3f27621eef..4869e4377a7 100644 --- a/Tests/LibJS/test262-runner.cpp +++ b/Tests/LibJS/test262-runner.cpp @@ -210,7 +210,7 @@ static ErrorOr run_test(StringView source, StringView filepath, return {}; } - auto vm = MUST(JS::VM::create()); + auto vm = JS::VM::create(); vm->set_dynamic_imports_allowed(true); GC::Ptr realm; diff --git a/Utilities/js.cpp b/Utilities/js.cpp index 89caf01eaba..7be494355e8 100644 --- a/Utilities/js.cpp +++ b/Utilities/js.cpp @@ -558,7 +558,7 @@ ErrorOr serenity_main(Main::Arguments arguments) AK::set_debug_enabled(!disable_debug_printing); s_history_path = TRY(String::formatted("{}/.js-history", Core::StandardPaths::home_directory())); - g_vm_storage.get() = TRY(JS::VM::create()); + g_vm_storage.get() = JS::VM::create(); g_vm = g_vm_storage->ptr(); g_vm->set_dynamic_imports_allowed(true);