RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:08:11 +00:00
Code Issues Activity Actions

LibJS/Bytecode: Actually generate & run bytecode for SourceTextModule

Browse source
This commit is contained in:
Andreas Kling 2023-06-24 16:07:15 +02:00
parent 8a5e71256d
commit 5d79431859
1 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Userland/Libraries/LibJS/SourceTextModule.cpp
View file

@ -7,6 +7,7 @@
#include <AK/Debug.h> #include <AK/Debug.h>
#include <AK/QuickSort.h> #include <AK/QuickSort.h>
#include <LibJS/Bytecode/Interpreter.h>
#include <LibJS/Interpreter.h> #include <LibJS/Interpreter.h>
#include <LibJS/Parser.h> #include <LibJS/Parser.h>
#include <LibJS/Runtime/ECMAScriptFunctionObject.h> #include <LibJS/Runtime/ECMAScriptFunctionObject.h>
@ -690,7 +691,26 @@ ThrowCompletionOr<void> SourceTextModule::execute_module(VM& vm, GCPtr<PromiseCa
TRY(vm.push_execution_context(module_context, {})); TRY(vm.push_execution_context(module_context, {}));
// c. Let result be the result of evaluating module.[[ECMAScriptCode]]. // c. Let result be the result of evaluating module.[[ECMAScriptCode]].
auto result = m_ecmascript_code->execute(vm.interpreter()); Completion result;
if (auto* bytecode_interpreter = vm.bytecode_interpreter_if_exists()) {
auto maybe_executable = Bytecode::compile(vm, m_ecmascript_code, FunctionKind::Normal, "ShadowRealmEval"sv);
if (maybe_executable.is_error())
result = maybe_executable.release_error();
else {
auto executable = maybe_executable.release_value();
auto value_and_frame = bytecode_interpreter->run_and_return_frame(realm(), *executable, nullptr);
if (value_and_frame.value.is_error()) {
result = value_and_frame.value.release_error();
} else {
// Resulting value is in the accumulator.
result = value_and_frame.frame->registers.at(0).value_or(js_undefined());
}
}
} else {
result = m_ecmascript_code->execute(vm.interpreter());
}
// d. Let env be moduleContext's LexicalEnvironment. // d. Let env be moduleContext's LexicalEnvironment.
auto env = module_context.lexical_environment; auto env = module_context.lexical_environment;
@ -708,7 +728,7 @@ ThrowCompletionOr<void> SourceTextModule::execute_module(VM& vm, GCPtr<PromiseCa
// h. If result is an abrupt completion, then // h. If result is an abrupt completion, then
if (result.is_error()) { if (result.is_error()) {
// i. Return ? result. // i. Return ? result.
return result; return result.release_error();
} }
} }
// 10. Else, // 10. Else,