diff options
Diffstat (limited to 'Userland/Libraries/LibJS')
| -rw-r--r-- | Userland/Libraries/LibJS/AST.cpp | 8 | ||||
| -rw-r--r-- | Userland/Libraries/LibJS/Interpreter.cpp | 100 | ||||
| -rw-r--r-- | Userland/Libraries/LibJS/Interpreter.h | 66 | ||||
| -rw-r--r-- | Userland/Libraries/LibJS/Runtime/AbstractOperations.cpp | 3 | ||||
| -rw-r--r-- | Userland/Libraries/LibJS/Runtime/ShadowRealm.cpp | 3 | ||||
| -rw-r--r-- | Userland/Libraries/LibJS/SourceTextModule.h | 2 |
6 files changed, 145 insertions, 37 deletions
diff --git a/Userland/Libraries/LibJS/AST.cpp b/Userland/Libraries/LibJS/AST.cpp index 48e56eae39..461613fdb9 100644 --- a/Userland/Libraries/LibJS/AST.cpp +++ b/Userland/Libraries/LibJS/AST.cpp @@ -243,16 +243,8 @@ Completion BlockStatement::execute(Interpreter& interpreter, GlobalObject& globa Completion Program::execute(Interpreter& interpreter, GlobalObject& global_object) const { - // FIXME: This tries to be "ScriptEvaluation" and "evaluating scriptBody" at once. It shouldn't. - // Clean this up and update perform_eval() / perform_shadow_realm_eval() - InterpreterNodeScope node_scope { interpreter, *this }; - VERIFY(interpreter.lexical_environment() && interpreter.lexical_environment()->is_global_environment()); - auto& global_env = static_cast<GlobalEnvironment&>(*interpreter.lexical_environment()); - - TRY(global_declaration_instantiation(interpreter, global_object, global_env)); - return evaluate_statements(interpreter, global_object); } 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() diff --git a/Userland/Libraries/LibJS/Interpreter.h b/Userland/Libraries/LibJS/Interpreter.h index 868cc423c1..aae9e76bc2 100644 --- a/Userland/Libraries/LibJS/Interpreter.h +++ b/Userland/Libraries/LibJS/Interpreter.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Andreas Kling <kling@serenityos.org> + * Copyright (c) 2022, Luke Wilde <lukew@serenityos.org> * * SPDX-License-Identifier: BSD-2-Clause */ @@ -19,11 +20,14 @@ #include <LibJS/Runtime/DeclarativeEnvironment.h> #include <LibJS/Runtime/ErrorTypes.h> #include <LibJS/Runtime/Exception.h> +#include <LibJS/Runtime/GlobalEnvironment.h> #include <LibJS/Runtime/GlobalObject.h> #include <LibJS/Runtime/MarkedValueList.h> #include <LibJS/Runtime/Realm.h> #include <LibJS/Runtime/VM.h> #include <LibJS/Runtime/Value.h> +#include <LibJS/Script.h> +#include <LibJS/SourceTextModule.h> namespace JS { @@ -34,26 +38,75 @@ struct ExecutingASTNodeChain { class Interpreter : public Weakable<Interpreter> { public: - template<typename GlobalObjectType, typename... Args> - static NonnullOwnPtr<Interpreter> create(VM& vm, Args&&... args) + // 9.6 InitializeHostDefinedRealm ( ), https://tc39.es/ecma262/#sec-initializehostdefinedrealm + template<typename GlobalObjectType, typename GlobalThisObjectType, typename... Args> + static NonnullOwnPtr<Interpreter> create(VM& vm, Args&&... args) requires(IsBaseOf<GlobalObject, GlobalObjectType>&& IsBaseOf<Object, GlobalThisObjectType>) { DeferGC defer_gc(vm.heap()); auto interpreter = adopt_own(*new Interpreter(vm)); VM::InterpreterExecutionScope scope(*interpreter); - auto* global_object = static_cast<GlobalObject*>(interpreter->heap().allocate_without_global_object<GlobalObjectType>(forward<Args>(args)...)); + + // 1. Let realm be CreateRealm(). auto* realm = Realm::create(vm); - realm->set_global_object(*global_object, global_object); + + // 2. Let newContext be a new execution context. (This was done in the Interpreter constructor) + + // 3. Set the Function of newContext to null. (This is done for us when the execution context is constructed) + + // 4. Set the Realm of newContext to realm. + interpreter->m_global_execution_context.realm = realm; + + // 5. Set the ScriptOrModule of newContext to null. (This was done during execution context construction) + + // 7. If the host requires use of an exotic object to serve as realm's global object, let global be such an object created in a host-defined manner. + // Otherwise, let global be undefined, indicating that an ordinary object should be created as the global object. + auto* global_object = static_cast<GlobalObject*>(interpreter->heap().allocate_without_global_object<GlobalObjectType>(forward<Args>(args)...)); + + // 6. Push newContext onto the execution context stack; newContext is now the running execution context. + // NOTE: This is out of order from the spec, but it shouldn't matter here. + vm.push_execution_context(interpreter->m_global_execution_context, *global_object); + + // 8. If the host requires that the this binding in realm's global scope return an object other than the global object, let thisValue be such an object created + // in a host-defined manner. Otherwise, let thisValue be undefined, indicating that realm's global this binding should be the global object. + if constexpr (IsSame<GlobalObjectType, GlobalThisObjectType>) { + // 9. Perform SetRealmGlobalObject(realm, global, thisValue). + realm->set_global_object(*global_object, global_object); + } else { + // FIXME: Should we pass args in here? Let's er on the side of caution and say yes. + auto* global_this_value = static_cast<Object*>(interpreter->heap().allocate_without_global_object<GlobalThisObjectType>(forward<Args>(args)...)); + + // 9. Perform SetRealmGlobalObject(realm, global, thisValue). + realm->set_global_object(*global_object, global_this_value); + } + + // NOTE: These are not in the spec. + static FlyString global_execution_context_name = "(global execution context)"; + interpreter->m_global_execution_context.function_name = global_execution_context_name; + interpreter->m_global_object = make_handle(global_object); interpreter->m_realm = make_handle(realm); + + // 10. Let globalObj be ? SetDefaultGlobalBindings(realm). + // 11. Create any host-defined global object properties on globalObj. static_cast<GlobalObjectType*>(global_object)->initialize_global_object(); + + // 12. Return NormalCompletion(empty). return interpreter; } + template<typename GlobalObjectType, typename... Args> + static NonnullOwnPtr<Interpreter> create(VM& vm, Args&&... args) requires IsBaseOf<GlobalObject, GlobalObjectType> + { + // NOTE: This function is here to facilitate step 8 of InitializeHostDefinedRealm. (Callers don't have to specify the same type twice if not necessary) + return create<GlobalObjectType, GlobalObjectType>(vm, args...); + } + static NonnullOwnPtr<Interpreter> create_with_existing_realm(Realm&); ~Interpreter(); - ThrowCompletionOr<Value> run(GlobalObject&, const Program&); + ThrowCompletionOr<Value> run(Script&); + ThrowCompletionOr<Value> run(SourceTextModule&); GlobalObject& global_object(); const GlobalObject& global_object() const; @@ -91,6 +144,9 @@ private: Handle<GlobalObject> m_global_object; Handle<Realm> m_realm; + + // This is here to keep the global execution context alive for the entire lifespan of the Interpreter. + ExecutionContext m_global_execution_context; }; } diff --git a/Userland/Libraries/LibJS/Runtime/AbstractOperations.cpp b/Userland/Libraries/LibJS/Runtime/AbstractOperations.cpp index 696284d27f..3dc90bc7e4 100644 --- a/Userland/Libraries/LibJS/Runtime/AbstractOperations.cpp +++ b/Userland/Libraries/LibJS/Runtime/AbstractOperations.cpp @@ -577,8 +577,7 @@ ThrowCompletionOr<Value> perform_eval(Value x, GlobalObject& caller_realm, Calle eval_result = {}; } else { auto& ast_interpreter = vm.interpreter(); - // FIXME: We need to use evaluate_statements() here because Program::execute() calls global_declaration_instantiation() when it shouldn't - eval_result = TRY(program->evaluate_statements(ast_interpreter, caller_realm)); + eval_result = TRY(program->execute(ast_interpreter, caller_realm)); } return eval_result.value_or(js_undefined()); diff --git a/Userland/Libraries/LibJS/Runtime/ShadowRealm.cpp b/Userland/Libraries/LibJS/Runtime/ShadowRealm.cpp index 2022265c21..211a842e9d 100644 --- a/Userland/Libraries/LibJS/Runtime/ShadowRealm.cpp +++ b/Userland/Libraries/LibJS/Runtime/ShadowRealm.cpp @@ -115,9 +115,8 @@ ThrowCompletionOr<Value> perform_shadow_realm_eval(GlobalObject& global_object, // 20. If result.[[Type]] is normal, then if (!eval_result.is_throw_completion()) { // TODO: Optionally use bytecode interpreter? - // FIXME: We need to use evaluate_statements() here because Program::execute() calls global_declaration_instantiation() when it shouldn't // a. Set result to the result of evaluating body. - result = program->evaluate_statements(vm.interpreter(), eval_realm.global_object()); + result = program->execute(vm.interpreter(), eval_realm.global_object()); } // 21. If result.[[Type]] is normal and result.[[Value]] is empty, then diff --git a/Userland/Libraries/LibJS/SourceTextModule.h b/Userland/Libraries/LibJS/SourceTextModule.h index ac3cba673f..c318e721f5 100644 --- a/Userland/Libraries/LibJS/SourceTextModule.h +++ b/Userland/Libraries/LibJS/SourceTextModule.h @@ -19,6 +19,8 @@ public: static Result<NonnullRefPtr<SourceTextModule>, Vector<Parser::Error>> parse(StringView source_text, Realm&, StringView filename = {}); virtual ~SourceTextModule(); + Program const& parse_node() const { return *m_ecmascript_code; } + private: explicit SourceTextModule(Realm&, NonnullRefPtr<Program>); |