From 13dfadba797799f66c2c369cc5fb489c35184c02 Mon Sep 17 00:00:00 2001
From: Timothy Flynn <trflynn89@pm.me>
Date: Fri, 17 Mar 2023 10:44:47 -0400
Subject: [PATCH] LibJS: Propagate errors from VM creation

---
 Meta/Lagom/Fuzzers/FuzzJs.cpp                           | 2 +-
 Meta/Lagom/Fuzzers/FuzzilliJs.cpp                       | 2 +-
 Meta/Lagom/Wasm/js_repl.cpp                             | 2 +-
 Tests/LibJS/test-bytecode-js.cpp                        | 2 +-
 Tests/LibJS/test262-runner.cpp                          | 2 +-
 Userland/Applications/Assistant/Providers.cpp           | 2 +-
 Userland/Applications/Spreadsheet/Workbook.cpp          | 2 +-
 Userland/Libraries/LibJS/Runtime/VM.cpp                 | 6 +++---
 Userland/Libraries/LibJS/Runtime/VM.h                   | 2 +-
 Userland/Libraries/LibTest/JavaScriptTestRunnerMain.cpp | 2 +-
 Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp     | 2 +-
 Userland/Libraries/LibWeb/HTML/Worker.cpp               | 2 +-
 Userland/Utilities/js.cpp                               | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Meta/Lagom/Fuzzers/FuzzJs.cpp b/Meta/Lagom/Fuzzers/FuzzJs.cpp
index 602a9d52f82..90fe12330df 100644
--- a/Meta/Lagom/Fuzzers/FuzzJs.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzJs.cpp
@@ -15,7 +15,7 @@
 extern "C" int LLVMFuzzerTestOneInput(uint8_t const* data, size_t size)
 {
     auto js = StringView(static_cast<unsigned char const*>(data), size);
-    auto vm = JS::VM::create();
+    auto vm = MUST(JS::VM::create());
     auto interpreter = JS::Interpreter::create<JS::GlobalObject>(*vm);
     auto parse_result = JS::Script::parse(js, interpreter->realm());
     if (!parse_result.is_error())
diff --git a/Meta/Lagom/Fuzzers/FuzzilliJs.cpp b/Meta/Lagom/Fuzzers/FuzzilliJs.cpp
index 3cc19f35aed..0ce08ccc665 100644
--- a/Meta/Lagom/Fuzzers/FuzzilliJs.cpp
+++ b/Meta/Lagom/Fuzzers/FuzzilliJs.cpp
@@ -190,7 +190,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 = JS::VM::create();
+    auto vm = MUST(JS::VM::create());
     auto interpreter = JS::Interpreter::create<TestRunnerGlobalObject>(*vm);
 
     while (true) {
diff --git a/Meta/Lagom/Wasm/js_repl.cpp b/Meta/Lagom/Wasm/js_repl.cpp
index 356ef65b4a1..9800037118e 100644
--- a/Meta/Lagom/Wasm/js_repl.cpp
+++ b/Meta/Lagom/Wasm/js_repl.cpp
@@ -359,7 +359,7 @@ extern "C" int initialize_repl(char const* time_zone)
     if (time_zone)
         setenv("TZ", time_zone, 1);
 
-    g_vm = JS::VM::create();
+    g_vm = MUST(JS::VM::create());
     g_vm->enable_default_host_import_module_dynamically_hook();
 
     // NOTE: These will print out both warnings when using something like Promise.reject().catch(...) -
diff --git a/Tests/LibJS/test-bytecode-js.cpp b/Tests/LibJS/test-bytecode-js.cpp
index e19bdc02c12..57eade2d0d2 100644
--- a/Tests/LibJS/test-bytecode-js.cpp
+++ b/Tests/LibJS/test-bytecode-js.cpp
@@ -13,7 +13,7 @@
 #include <LibTest/TestCase.h>
 
 #define SETUP_AND_PARSE(source)                                                     \
-    auto vm = JS::VM::create();                                                     \
+    auto vm = MUST(JS::VM::create());                                               \
     auto ast_interpreter = JS::Interpreter::create<JS::GlobalObject>(*vm);          \
                                                                                     \
     auto script_or_error = JS::Script::parse(source##sv, ast_interpreter->realm()); \
diff --git a/Tests/LibJS/test262-runner.cpp b/Tests/LibJS/test262-runner.cpp
index 898930a1ff8..4747b44c943 100644
--- a/Tests/LibJS/test262-runner.cpp
+++ b/Tests/LibJS/test262-runner.cpp
@@ -232,7 +232,7 @@ static Result<void, TestError> run_test(StringView source, StringView filepath,
         return {};
     }
 
-    auto vm = JS::VM::create();
+    auto vm = MUST(JS::VM::create());
     vm->enable_default_host_import_module_dynamically_hook();
     auto ast_interpreter = JS::Interpreter::create<JS::Test262::GlobalObject>(*vm);
     auto& realm = ast_interpreter->realm();
diff --git a/Userland/Applications/Assistant/Providers.cpp b/Userland/Applications/Assistant/Providers.cpp
index 566e0596ba7..d1cbbadfcfe 100644
--- a/Userland/Applications/Assistant/Providers.cpp
+++ b/Userland/Applications/Assistant/Providers.cpp
@@ -88,7 +88,7 @@ void CalculatorProvider::query(DeprecatedString const& query, Function<void(Vect
     if (!query.starts_with('='))
         return;
 
-    auto vm = JS::VM::create();
+    auto vm = JS::VM::create().release_value_but_fixme_should_propagate_errors();
     auto interpreter = JS::Interpreter::create<JS::GlobalObject>(*vm);
 
     auto source_code = query.substring(1);
diff --git a/Userland/Applications/Spreadsheet/Workbook.cpp b/Userland/Applications/Spreadsheet/Workbook.cpp
index 8c85abd3324..1bf24dfbe62 100644
--- a/Userland/Applications/Spreadsheet/Workbook.cpp
+++ b/Userland/Applications/Spreadsheet/Workbook.cpp
@@ -20,7 +20,7 @@ namespace Spreadsheet {
 
 Workbook::Workbook(Vector<NonnullRefPtr<Sheet>>&& sheets, GUI::Window& parent_window)
     : m_sheets(move(sheets))
-    , m_vm(JS::VM::create())
+    , m_vm(JS::VM::create().release_value_but_fixme_should_propagate_errors())
     , m_interpreter(JS::Interpreter::create<JS::GlobalObject>(m_vm))
     , m_interpreter_scope(*m_interpreter)
     , m_main_execution_context(m_vm->heap())
diff --git a/Userland/Libraries/LibJS/Runtime/VM.cpp b/Userland/Libraries/LibJS/Runtime/VM.cpp
index 64c90a6d0ac..b6e9857ee24 100644
--- a/Userland/Libraries/LibJS/Runtime/VM.cpp
+++ b/Userland/Libraries/LibJS/Runtime/VM.cpp
@@ -34,16 +34,16 @@
 
 namespace JS {
 
-NonnullRefPtr<VM> VM::create(OwnPtr<CustomData> custom_data)
+ErrorOr<NonnullRefPtr<VM>> VM::create(OwnPtr<CustomData> custom_data)
 {
     ErrorMessages error_messages {};
-    error_messages[to_underlying(ErrorMessage::OutOfMemory)] = String::from_utf8(ErrorType::OutOfMemory.message()).release_value_but_fixme_should_propagate_errors();
+    error_messages[to_underlying(ErrorMessage::OutOfMemory)] = TRY(String::from_utf8(ErrorType::OutOfMemory.message()));
 
     auto vm = adopt_ref(*new VM(move(custom_data), move(error_messages)));
 
     WellKnownSymbols well_known_symbols {
 #define __JS_ENUMERATE(SymbolName, snake_name) \
-    Symbol::create(*vm, "Symbol." #SymbolName##_string.release_value_but_fixme_should_propagate_errors(), false),
+    Symbol::create(*vm, TRY("Symbol." #SymbolName##_string), false),
         JS_ENUMERATE_WELL_KNOWN_SYMBOLS
 #undef __JS_ENUMERATE
     };
diff --git a/Userland/Libraries/LibJS/Runtime/VM.h b/Userland/Libraries/LibJS/Runtime/VM.h
index e306ef2a512..017acf3a84f 100644
--- a/Userland/Libraries/LibJS/Runtime/VM.h
+++ b/Userland/Libraries/LibJS/Runtime/VM.h
@@ -38,7 +38,7 @@ public:
         virtual void spin_event_loop_until(Function<bool()> goal_condition) = 0;
     };
 
-    static NonnullRefPtr<VM> create(OwnPtr<CustomData> = {});
+    static ErrorOr<NonnullRefPtr<VM>> create(OwnPtr<CustomData> = {});
     ~VM() = default;
 
     Heap& heap() { return m_heap; }
diff --git a/Userland/Libraries/LibTest/JavaScriptTestRunnerMain.cpp b/Userland/Libraries/LibTest/JavaScriptTestRunnerMain.cpp
index 98a092a0cdc..e0f7edf3f61 100644
--- a/Userland/Libraries/LibTest/JavaScriptTestRunnerMain.cpp
+++ b/Userland/Libraries/LibTest/JavaScriptTestRunnerMain.cpp
@@ -189,7 +189,7 @@ int main(int argc, char** argv)
         g_main_hook();
 
     if (!g_vm) {
-        g_vm = JS::VM::create();
+        g_vm = MUST(JS::VM::create());
         g_vm->enable_default_host_import_module_dynamically_hook();
     }
 
diff --git a/Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp b/Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp
index f54577a34c2..00e6a3fb6dc 100644
--- a/Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp
+++ b/Userland/Libraries/LibWeb/Bindings/MainThreadVM.cpp
@@ -56,7 +56,7 @@ JS::VM& main_thread_vm()
 {
     static RefPtr<JS::VM> vm;
     if (!vm) {
-        vm = JS::VM::create(make<WebEngineCustomData>());
+        vm = JS::VM::create(make<WebEngineCustomData>()).release_value_but_fixme_should_propagate_errors();
 
         // NOTE: We intentionally leak the main thread JavaScript VM.
         //       This avoids doing an exhaustive garbage collection on process exit.
diff --git a/Userland/Libraries/LibWeb/HTML/Worker.cpp b/Userland/Libraries/LibWeb/HTML/Worker.cpp
index 27bf5fee1bd..5a5ef7a333b 100644
--- a/Userland/Libraries/LibWeb/HTML/Worker.cpp
+++ b/Userland/Libraries/LibWeb/HTML/Worker.cpp
@@ -23,7 +23,7 @@ Worker::Worker(String const& script_url, WorkerOptions const options, DOM::Docum
     , m_options(options)
     , m_document(&document)
     , m_custom_data()
-    , m_worker_vm(JS::VM::create(adopt_own(m_custom_data)))
+    , m_worker_vm(JS::VM::create(adopt_own(m_custom_data)).release_value_but_fixme_should_propagate_errors())
     , m_interpreter(JS::Interpreter::create<JS::GlobalObject>(m_worker_vm))
     , m_interpreter_scope(*m_interpreter)
     , m_implicit_port(MessagePort::create(document.realm()).release_value_but_fixme_should_propagate_errors())
diff --git a/Userland/Utilities/js.cpp b/Userland/Utilities/js.cpp
index 48a446965bc..ae303708eb0 100644
--- a/Userland/Utilities/js.cpp
+++ b/Userland/Utilities/js.cpp
@@ -621,7 +621,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
 
     s_history_path = TRY(String::formatted("{}/.js-history", Core::StandardPaths::home_directory()));
 
-    g_vm = JS::VM::create();
+    g_vm = TRY(JS::VM::create());
     g_vm->enable_default_host_import_module_dynamically_hook();
 
     // NOTE: These will print out both warnings when using something like Promise.reject().catch(...) -