LibJS/JIT: Resolve the EnvironmentVariableCache pointers at JIT time

This commit is contained in:
Andreas Kling 2023-11-05 15:14:54 +01:00
parent a616a682fe
commit 536b9c29e4
Notes: sideshowbarker 2024-07-17 20:58:35 +09:00
5 changed files with 17 additions and 13 deletions

View file

@ -308,26 +308,25 @@ ThrowCompletionOr<void> put_by_value(VM& vm, Value base, Value property_key_valu
return {};
}
ThrowCompletionOr<Value> get_variable(Bytecode::Interpreter& interpreter, DeprecatedFlyString const& name, u32 cache_index)
ThrowCompletionOr<Value> get_variable(Bytecode::Interpreter& interpreter, DeprecatedFlyString const& name, EnvironmentVariableCache& cache)
{
auto& vm = interpreter.vm();
auto& cached_environment_coordinate = interpreter.current_executable().environment_variable_caches[cache_index];
if (cached_environment_coordinate.has_value()) {
if (cache.has_value()) {
auto environment = vm.running_execution_context().lexical_environment;
for (size_t i = 0; i < cached_environment_coordinate->hops; ++i)
for (size_t i = 0; i < cache->hops; ++i)
environment = environment->outer_environment();
VERIFY(environment);
VERIFY(environment->is_declarative_environment());
if (!environment->is_permanently_screwed_by_eval()) {
return TRY(verify_cast<DeclarativeEnvironment>(*environment).get_binding_value_direct(vm, cached_environment_coordinate.value().index, vm.in_strict_mode()));
return TRY(verify_cast<DeclarativeEnvironment>(*environment).get_binding_value_direct(vm, cache.value().index, vm.in_strict_mode()));
}
cached_environment_coordinate = {};
cache = {};
}
auto reference = TRY(vm.resolve_binding(name));
if (reference.environment_coordinate().has_value())
cached_environment_coordinate = reference.environment_coordinate();
cache = reference.environment_coordinate();
return TRY(reference.get_value(vm));
}