Skip to content

[JSC] removeEntry() and clearAll() keep the realm's [[LoadedModules]] in step with the registry #748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dylan-conway merged 9 commits into from
Sep 30, 2026
Merged

[JSC] removeEntry() and clearAll() keep the realm's [[LoadedModules]] in step with the registry #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e8bfeef
[JSC] A module load left in flight by removeEntry() or clearAll() wri…
dylan-conway Sep 30, 2026
71e808b
A load by name has its registry entry from loadModule() on and no lon…
dylan-conway Sep 30, 2026
b64e865
A module load asks the registry for its entry once: hostLoadImportedM…
dylan-conway Sep 30, 2026
4de861d
provideFetch() is the fetch of an entry that is still waiting for one
dylan-conway Sep 30, 2026
b0ab9f6
moduleLoadTopSettled names its entry once
dylan-conway Sep 30, 2026
eff6b5f
An entry whose fetch failed leaves the registry when it fails, in set…
dylan-conway Sep 30, 2026
e0e02de
Put the loader back as it is on main and drop the realm's [[LoadedMod…
dylan-conway Sep 30, 2026
c4c4663
Keep the realm's [[LoadedModules]] as it is on main, and do not add a…
dylan-conway Sep 30, 2026
25dd940
removeEntry() takes a module out of the realm's [[LoadedModules]] und…
dylan-conway Sep 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Source/JavaScriptCore/runtime/JSModuleLoader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,17 @@ void JSModuleLoader::finishLoadingImportedModule(JSGlobalObject* globalObject, c
auto scope = DECLARE_THROW_SCOPE(vm);

// 1. If result is a normal completion, then
#if USE(BUN_JSC_ADDITIONS)
// hostLoadImportedModule() relies on the realm's [[LoadedModules]] holding only what the registry holds. removeEntry()
// and clearAll() take a module out of both, and a load of it that was in flight then must not put it back into one.
auto isRegistered = [&](AbstractModuleRecord* record) {
ModuleRegistryEntry* entry = getRegisteredMayBeNull(record->moduleKey(), moduleRequest.type());
return entry && entry->record() == record;
};
if (auto* resultRecord = std::get_if<AbstractModuleRecord*>(&result); resultRecord && (!referrer.isRealm() || isRegistered(*resultRecord))) {
Comment thread
dylan-conway marked this conversation as resolved.
Comment thread
dylan-conway marked this conversation as resolved.
#else
if (auto* resultRecord = std::get_if<AbstractModuleRecord*>(&result)) {
#endif
JSCell* owner = nullptr;

auto& loadedModules = [&] -> ModuleMap<AbstractModuleRecord::LoadedModuleRequest> & {
Expand Down
3 changes: 2 additions & 1 deletion Source/JavaScriptCore/runtime/JSModuleLoader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ class JSModuleLoader final : public JSCell {
auto* impl = key.impl();
Locker locker { cellLock() }; // visitChildren iterates these
forgetPrelinkedRecordsWithKey(impl);
m_loadedModules.removeIf([&](auto& entry) { return entry.key.first == impl; });
// Keyed by the specifier that was asked for, which resolve() may have turned into another key.
m_loadedModules.removeIf([&](auto& entry) { return entry.key.first == impl || entry.value.m_module->moduleKey().impl() == impl; });
m_resolutionFailures.removeIf([&](auto& entry) { return entry.key.first == impl || entry.key.second == impl; });
return m_moduleMap.removeIf([&](auto& entry) {
if (entry.key.first != impl)
Expand Down
Loading