dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibJS: Store module indirect bindings in a HashMap

Browse source 
Previously, these were stored in a vector that was linearly scanned.
For large sites this vector could contain hundreds of entries, so
a HashMap gives a significant speedup.
This commit is contained in:
Tim Ledbetter 2026-06-19 15:07:27 +01:00 committed by Shannon Booth
parent 6eba8860f7
commit 5ec468bfdd
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Libraries/LibJS/Runtime/ModuleEnvironment.cpp
View file

@ -74,10 +74,8 @@ ThrowCompletionOr<void> ModuleEnvironment::create_import_binding(Utf16FlyString
// FIXME: I don't know what this means or how to check it.
// 3. Create an immutable indirect binding in envRec for N that references M and N2 as its target binding and record that the binding is initialized.
// Note: We use the fact that the binding is in this list as it being initialized.
m_indirect_bindings.append({ move(name),
module,
move(binding_name) });
// Note: We use the fact that the binding is in this map as it being initialized.
m_indirect_bindings.set(move(name), IndirectBinding { module, move(binding_name) });
// 4. Return unused.
return {};
@ -85,13 +83,11 @@ ThrowCompletionOr<void> ModuleEnvironment::create_import_binding(Utf16FlyString
ModuleEnvironment::IndirectBinding const* ModuleEnvironment::get_indirect_binding(Utf16FlyString const& name) const
{
auto binding_or_end = m_indirect_bindings.find_if([&](IndirectBinding const& binding) {
return binding.name == name;
});
if (binding_or_end.is_end())
auto it = m_indirect_bindings.find(name);
if (it == m_indirect_bindings.end())
return nullptr;
return &(*binding_or_end);
return &it->value;
}
Optional<ModuleEnvironment::BindingAndIndex> ModuleEnvironment::find_binding_and_index(Utf16FlyString const& name) const
@ -131,14 +127,14 @@ Optional<ModuleEnvironment::BindingAndIndex> ModuleEnvironment::find_binding_and
size_t ModuleEnvironment::external_memory_size() const
{
auto size = DeclarativeEnvironment::external_memory_size();
size = saturating_add_external_memory_size(size, vector_external_memory_size(m_indirect_bindings));
size = saturating_add_external_memory_size(size, hash_map_external_memory_size(m_indirect_bindings));
return size;
}
void ModuleEnvironment::visit_edges(Visitor& visitor)
{
Base::visit_edges(visitor);
for (auto& indirect_binding : m_indirect_bindings)
for (auto& [_, indirect_binding] : m_indirect_bindings)
visitor.visit(indirect_binding.module);
}

5
Libraries/LibJS/Runtime/ModuleEnvironment.h
View file

@ -6,6 +6,7 @@
#pragma once
#include <AK/HashMap.h>
#include <LibJS/Module.h>
#include <LibJS/Runtime/DeclarativeEnvironment.h>
#include <LibJS/Runtime/Environment.h>
@ -35,7 +36,6 @@ private:
virtual size_t external_memory_size() const override;
struct IndirectBinding {
Utf16FlyString name;
GC::Ptr<Module> module;
Utf16FlyString binding_name;
};
@ -43,8 +43,7 @@ private:
virtual Optional<BindingAndIndex> find_binding_and_index(Utf16FlyString const& name) const override;
// FIXME: Since we always access this via the name this could be a map.
Vector<IndirectBinding> m_indirect_bindings;
HashMap<Utf16FlyString, IndirectBinding> m_indirect_bindings;
};
}