summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibJS/Interpreter.cpp
diff options
context:
space:
mode:
authorLuke Wilde <lukew@serenityos.org>2022-01-16 13:16:04 +0100
committerLinus Groh <mail@linusgroh.de>2022-01-22 01:21:18 +0000
commit631bbcd00a32773aa22ece270ba00628c1240d4c (patch)
treea12959a306d8a47ffe3f343942e69b9f4abb2a82 /Userland/Libraries/LibJS/Interpreter.cpp
parent232a8432b7f879140c50df8114b7467f45e99349 (diff)
downloadserenity-631bbcd00a32773aa22ece270ba00628c1240d4c.zip
LibJS: Refactor interpreter to use Script and Source Text Modules
This also refactors interpreter creation to follow InitializeHostDefinedRealm, but I couldn't fit it in the title :^) This allows us to follow the spec much more closely rather than being completely ad-hoc with just the parse node instead of having all the surrounding data such as the realm of the parse node. The interpreter creation refactor creates the global execution context once and doesn't take it off the stack. This allows LibWeb to take the global execution context and manually handle it, following the HTML spec. The HTML spec calls this the "realm execution context" of the environment settings object. It also allows us to specify the globalThis type, as it can be different from the global object type. For example, on the web, Window global objects use a WindowProxy global this value to enforce the same origin policy on operations like [[GetOwnProperty]]. Finally, it allows us to directly call Program::execute in perform_eval and perform_shadow_realm_eval as this moves global_declaration_instantiation into Interpreter::run (ScriptEvaluation) as per the spec. Note that this doesn't evalulate Source Text Modules yet or refactor the bytecode interpreter, that's work for future us :^) This patch was originally build by Luke for the environment settings object change but was also needed for modules. So I (davidot) have modified it with the new completion changes and setup for that. Co-authored-by: davidot <davidot@serenityos.org>
Diffstat (limited to 'Userland/Libraries/LibJS/Interpreter.cpp')
-rw-r--r--Userland/Libraries/LibJS/Interpreter.cpp100
1 files changed, 80 insertions, 20 deletions
diff --git a/Userland/Libraries/LibJS/Interpreter.cpp b/Userland/Libraries/LibJS/Interpreter.cpp
index 18d5034918..af08e232c1 100644
--- a/Userland/Libraries/LibJS/Interpreter.cpp
+++ b/Userland/Libraries/LibJS/Interpreter.cpp
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2020-2021, Linus Groh <linusg@serenityos.org>
+ * Copyright (c) 2022, Luke Wilde <lukew@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@@ -31,6 +32,7 @@ NonnullOwnPtr<Interpreter> Interpreter::create_with_existing_realm(Realm& realm)
Interpreter::Interpreter(VM& vm)
: m_vm(vm)
+ , m_global_execution_context(vm.heap())
{
}
@@ -38,42 +40,100 @@ Interpreter::~Interpreter()
{
}
-ThrowCompletionOr<Value> Interpreter::run(GlobalObject& global_object, const Program& program)
+// 16.1.6 ScriptEvaluation ( scriptRecord ), https://tc39.es/ecma262/#sec-runtime-semantics-scriptevaluation
+ThrowCompletionOr<Value> Interpreter::run(Script& script_record)
{
- // FIXME: Why does this receive a GlobalObject? Interpreter has one already, and this might not be in sync with the Realm's GlobalObject.
-
auto& vm = this->vm();
VERIFY(!vm.exception());
VM::InterpreterExecutionScope scope(*this);
- ExecutionContext execution_context(heap());
- execution_context.current_node = &program;
- execution_context.this_value = &global_object;
- static FlyString global_execution_context_name = "(global execution context)";
- execution_context.function_name = global_execution_context_name;
- execution_context.lexical_environment = &realm().global_environment();
- execution_context.variable_environment = &realm().global_environment();
- execution_context.realm = &realm();
- execution_context.is_strict_mode = program.is_strict_mode();
- MUST(vm.push_execution_context(execution_context, global_object));
- auto completion = program.execute(*this, global_object);
+ // 1. Let globalEnv be scriptRecord.[[Realm]].[[GlobalEnv]].
+ auto& global_environment = script_record.realm().global_environment();
+
+ // NOTE: This isn't in the spec but we require it.
+ auto& global_object = script_record.realm().global_object();
+
+ // 2. Let scriptContext be a new ECMAScript code execution context.
+ ExecutionContext script_context(vm.heap());
+
+ // 3. Set the Function of scriptContext to null. (This was done in the construction of script_context)
+
+ // 4. Set the Realm of scriptContext to scriptRecord.[[Realm]].
+ script_context.realm = &script_record.realm();
+
+ // FIXME: 5. Set the ScriptOrModule of scriptContext to scriptRecord.
+
+ // 6. Set the VariableEnvironment of scriptContext to globalEnv.
+ script_context.variable_environment = &global_environment;
+
+ // 7. Set the LexicalEnvironment of scriptContext to globalEnv.
+ script_context.lexical_environment = &global_environment;
+
+ // 8. Set the PrivateEnvironment of scriptContext to null.
+
+ // NOTE: This isn't in the spec, but we require it.
+ script_context.is_strict_mode = script_record.parse_node().is_strict_mode();
+
+ // FIXME: 9. Suspend the currently running execution context.
+
+ // 10. Push scriptContext onto the execution context stack; scriptContext is now the running execution context.
+ vm.push_execution_context(script_context, global_object);
+
+ // 11. Let scriptBody be scriptRecord.[[ECMAScriptCode]].
+ auto& script_body = script_record.parse_node();
+
+ // 12. Let result be GlobalDeclarationInstantiation(scriptBody, globalEnv).
+ auto instantiation_result = script_body.global_declaration_instantiation(*this, global_object, global_environment);
+ Completion result = instantiation_result.is_throw_completion() ? instantiation_result.throw_completion() : normal_completion({});
+
+ // 13. If result.[[Type]] is normal, then
+ if (result.type() == Completion::Type::Normal) {
+ // a. Set result to the result of evaluating scriptBody.
+ result = script_body.execute(*this, global_object);
+ }
+
+ // 14. If result.[[Type]] is normal and result.[[Value]] is empty, then
+ if (result.type() == Completion::Type::Normal && !result.value().has_value()) {
+ // a. Set result to NormalCompletion(undefined).
+ result = normal_completion(js_undefined());
+ }
+
+ // FIXME: 15. Suspend scriptContext and remove it from the execution context stack.
+ vm.pop_execution_context();
+
+ // 16. Assert: The execution context stack is not empty.
+ VERIFY(!vm.execution_context_stack().is_empty());
+
+ // FIXME: 17. Resume the context that is now on the top of the execution context stack as the running execution context.
// At this point we may have already run any queued promise jobs via on_call_stack_emptied,
// in which case this is a no-op.
+ // FIXME: These three should be moved out of Interpreter::run and give the host an option to run these, as it's up to the host when these get run.
+ // https://tc39.es/ecma262/#sec-jobs for jobs and https://tc39.es/ecma262/#_ref_3508 for ClearKeptObjects
+ // finish_execution_generation is particularly an issue for LibWeb, as the HTML spec wants to run it specifically after performing a microtask checkpoint.
+ // The promise and registry cleanup queues don't cause LibWeb an issue, as LibWeb overrides the hooks that push onto these queues.
vm.run_queued_promise_jobs();
vm.run_queued_finalization_registry_cleanup_jobs();
- vm.pop_execution_context();
-
vm.finish_execution_generation();
- if (completion.is_abrupt()) {
- VERIFY(completion.type() == Completion::Type::Throw);
- return completion.release_error();
+ // 18. Return Completion(result).
+ if (result.is_abrupt()) {
+ VERIFY(result.type() == Completion::Type::Throw);
+ return result.release_error();
}
- return completion.value().value_or(js_undefined());
+
+ VERIFY(result.value().has_value());
+ return *result.value();
+}
+
+ThrowCompletionOr<Value> Interpreter::run(SourceTextModule&)
+{
+ auto* error = InternalError::create(global_object(), "Can't run modules directly yet :^(");
+ vm().throw_exception(global_object(), Value { error });
+ return throw_completion(error);
}
GlobalObject& Interpreter::global_object()