eliott/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird synced 2026-04-26 01:35:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "LibJS: Shrink ExecutionContext by replacing ScriptOrModule …"

Browse Source 
… with Cell*.

This reverts commit d3495c62a7.
This commit is contained in:
Tim Ledbetter
2026-03-11 20:35:43 +00:00
committed by Tim Ledbetter
parent ba8d63556f
commit 36f74ba96c
Notes: github-actions[bot] 2026-03-11 23:14:19 +00:00 
Author: https://github.com/tcl3
Commit: https://github.com/LadybirdBrowser/ladybird/commit/36f74ba96ce
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/8374
16 changed files with 50 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Libraries/LibJS/Bytecode/AsmInterpreter/AsmInterpreter.cpp
View File

@@ -641,10 +641,10 @@ i64 asm_try_get_global_env_binding(Interpreter* interp, u32 pc)
auto& vm = Interpreter::vm();
ThrowCompletionOr<Value> result = js_undefined();
if (cache.in_module_environment) {
auto* module = as_if<Module>(vm.running_execution_context().script_or_module.ptr());
auto module = vm.running_execution_context().script_or_module.get_pointer<GC::Ref<Module>>();
if (!module) [[unlikely]]
return 1;
result = module->environment()->get_binding_value_direct(vm, cache.environment_binding_index);
result = (*module)->environment()->get_binding_value_direct(vm, cache.environment_binding_index);
} else {
result = interp->global_declarative_environment().get_binding_value_direct(vm, cache.environment_binding_index);
}
@@ -672,10 +672,10 @@ i64 asm_try_set_global_env_binding(Interpreter* interp, u32 pc)
auto src = interp->get(insn.src());
ThrowCompletionOr<void> result;
if (cache.in_module_environment) {
auto* module = as_if<Module>(vm.running_execution_context().script_or_module.ptr());
auto module = vm.running_execution_context().script_or_module.get_pointer<GC::Ref<Module>>();
if (!module) [[unlikely]]
return 1;
result = module->environment()->set_mutable_binding_direct(vm, cache.environment_binding_index, src, insn.strict() == Strict::Yes);
result = (*module)->environment()->set_mutable_binding_direct(vm, cache.environment_binding_index, src, insn.strict() == Strict::Yes);
} else {
result = interp->global_declarative_environment().set_mutable_binding_direct(vm, cache.environment_binding_index, src, insn.strict() == Strict::Yes);
}

18
Libraries/LibJS/Bytecode/Interpreter.cpp
View File

@@ -149,7 +149,7 @@ ThrowCompletionOr<Value> Interpreter::run(Script& script_record, GC::Ptr<Environ
script_context->realm = &script_record.realm();
// 5. Set the ScriptOrModule of scriptContext to scriptRecord.
script_context->script_or_module = &script_record;
script_context->script_or_module = GC::Ref<Script>(script_record);
// 6. Set the VariableEnvironment of scriptContext to globalEnv.
script_context->variable_environment = &global_environment;
@@ -1086,8 +1086,8 @@ inline ThrowCompletionOr<Value> get_global(Interpreter& interpreter, IdentifierT
// we can use the cached environment binding index.
if (cache.has_environment_binding_index) {
if (cache.in_module_environment) {
auto* module = as_if<Module>(vm.running_execution_context().script_or_module.ptr());
return module->environment()->get_binding_value_direct(vm, cache.environment_binding_index);
auto module = vm.running_execution_context().script_or_module.get_pointer<GC::Ref<Module>>();
return (*module)->environment()->get_binding_value_direct(vm, cache.environment_binding_index);
}
return declarative_record.get_binding_value_direct(vm, cache.environment_binding_index);
}
@@ -1097,10 +1097,10 @@ inline ThrowCompletionOr<Value> get_global(Interpreter& interpreter, IdentifierT
auto& identifier = interpreter.get_identifier(identifier_index);
if (auto* module = as_if<Module>(vm.running_execution_context().script_or_module.ptr())) {
if (auto* module = vm.running_execution_context().script_or_module.get_pointer<GC::Ref<Module>>()) {
// NOTE: GetGlobal is used to access variables stored in the module environment and global environment.
// The module environment is checked first since it precedes the global environment in the environment chain.
auto& module_environment = *module->environment();
auto& module_environment = *(*module)->environment();
Optional<size_t> index;
if (TRY(module_environment.has_binding(identifier, &index))) {
if (index.has_value()) {
@@ -2317,8 +2317,8 @@ ThrowCompletionOr<void> SetGlobal::execute_impl(Bytecode::Interpreter& interpret
// we can use the cached environment binding index.
if (cache.has_environment_binding_index) {
if (cache.in_module_environment) {
auto* module = as_if<Module>(vm.running_execution_context().script_or_module.ptr());
TRY(module->environment()->set_mutable_binding_direct(vm, cache.environment_binding_index, src, strict() == Strict::Yes));
auto module = vm.running_execution_context().script_or_module.get_pointer<GC::Ref<Module>>();
TRY((*module)->environment()->set_mutable_binding_direct(vm, cache.environment_binding_index, src, strict() == Strict::Yes));
} else {
TRY(declarative_record.set_mutable_binding_direct(vm, cache.environment_binding_index, src, strict() == Strict::Yes));
}
@@ -2330,10 +2330,10 @@ ThrowCompletionOr<void> SetGlobal::execute_impl(Bytecode::Interpreter& interpret
auto& identifier = interpreter.get_identifier(m_identifier);
if (auto* module = as_if<Module>(vm.running_execution_context().script_or_module.ptr())) {
if (auto* module = vm.running_execution_context().script_or_module.get_pointer<GC::Ref<Module>>()) {
// NOTE: GetGlobal is used to access variables stored in the module environment and global environment.
// The module environment is checked first since it precedes the global environment in the environment chain.
auto& module_environment = *module->environment();
auto& module_environment = *(*module)->environment();
Optional<size_t> index;
if (TRY(module_environment.has_binding(identifier, &index))) {
if (index.has_value()) {