Stowage/ladybird
2
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-12-08 06:09:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

LibJS: Pass ExecutionContext to Interpreter::run_executable()

Browse source 
This avoids having to get it from the VM's context stack, since most
callers already have it on hand.
This commit is contained in:
Andreas Kling 2025-10-29 09:32:38 +01:00 • committed by Andreas Kling
parent a7d13b107e
commit 9dae1acc31
Notes: github-actions[bot] 2025-10-29 20:21:51 +00:00
9 changed files with 31 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Libraries/LibJS/Runtime/ECMAScriptFunctionObject.cpp
View file

@ -546,7 +546,7 @@ FLATTEN ThrowCompletionOr<Value> ECMAScriptFunctionObject::internal_call(Executi
ordinary_call_bind_this(vm, callee_context, this_argument);
// 6. Let result be Completion(OrdinaryCallEvaluateBody(F, argumentsList)).
auto result = ordinary_call_evaluate_body(vm);
auto result = ordinary_call_evaluate_body(vm, callee_context);
// 7. Remove calleeContext from the execution context stack and restore callerContext as the running execution context.
vm.pop_execution_context();
@ -607,7 +607,7 @@ FLATTEN ThrowCompletionOr<GC::Ref<Object>> ECMAScriptFunctionObject::internal_co
auto constructor_env = callee_context.lexical_environment;
// 8. Let result be Completion(OrdinaryCallEvaluateBody(F, argumentsList)).
auto result = ordinary_call_evaluate_body(vm);
auto result = ordinary_call_evaluate_body(vm, callee_context);
// 9. Remove calleeContext from the execution context stack and restore callerContext as the running execution context.
vm.pop_execution_context();
@ -823,7 +823,7 @@ void async_block_start(VM& vm, T const& async_body, PromiseCapability const& pro
if (maybe_executable.is_error())
result = maybe_executable.release_error();
else
result = vm.bytecode_interpreter().run_executable(*maybe_executable.value(), {}).value;
result = vm.bytecode_interpreter().run_executable(vm.running_execution_context(), *maybe_executable.value(), {}).value;
}
// c. Else,
else {
@ -884,9 +884,9 @@ template void async_function_start(VM&, PromiseCapability const&, GC::Function<C
// 10.2.1.4 OrdinaryCallEvaluateBody ( F, argumentsList ), https://tc39.es/ecma262/#sec-ordinarycallevaluatebody
// 15.8.4 Runtime Semantics: EvaluateAsyncFunctionBody, https://tc39.es/ecma262/#sec-runtime-semantics-evaluatefunctionbody
ThrowCompletionOr<Value> ECMAScriptFunctionObject::ordinary_call_evaluate_body(VM& vm)
ThrowCompletionOr<Value> ECMAScriptFunctionObject::ordinary_call_evaluate_body(VM& vm, ExecutionContext& context)
{
auto result_and_frame = vm.bytecode_interpreter().run_executable(*bytecode_executable(), {});
auto result_and_frame = vm.bytecode_interpreter().run_executable(context, *bytecode_executable(), {});
if (result_and_frame.value.is_error()) [[unlikely]] {
return result_and_frame.value.release_error();
@ -899,18 +899,17 @@ ThrowCompletionOr<Value> ECMAScriptFunctionObject::ordinary_call_evaluate_body(V
if (kind() == FunctionKind::Normal)
return result;
auto& realm = *vm.current_realm();
if (kind() == FunctionKind::AsyncGenerator) {
auto async_generator_object = TRY(AsyncGenerator::create(realm, result, this, vm.running_execution_context().copy()));
auto async_generator_object = TRY(AsyncGenerator::create(*context.realm, result, this, context.copy()));
return async_generator_object;
}
auto generator_object = TRY(GeneratorObject::create(realm, result, this, vm.running_execution_context().copy()));
auto generator_object = TRY(GeneratorObject::create(*context.realm, result, this, context.copy()));
// NOTE: Async functions are entirely transformed to generator functions, and wrapped in a custom driver that returns a promise
// See AwaitExpression::generate_bytecode() for the transformation.
if (kind() == FunctionKind::Async)
return AsyncFunctionDriverWrapper::create(realm, generator_object);
return AsyncFunctionDriverWrapper::create(*context.realm, generator_object);
ASSERT(kind() == FunctionKind::Generator);
return generator_object;