Skip to content

module-loader: don't double-fire moduleRegistryModuleSettled after inline sync replay #217

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

Open
robobun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

module-loader: don't double-fire moduleRegistryModuleSettled after inline sync replay #217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions Source/JavaScriptCore/runtime/JSMicrotask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,18 @@ static void moduleRegistryModuleSettled(JSGlobalObject* globalObject, VM& vm, st
auto* entry = uncheckedDowncast<ModuleRegistryEntry>(arguments[2]);
auto* modulePromise = uncheckedDowncast<JSPromise>(arguments[0]);
auto status = static_cast<JSPromise::Status>(payload);
#if USE(BUN_JSC_ADDITIONS)
// hostLoadImportedModule's synchronous-replay path (JSModuleLoader.cpp
// branch `fetchPromise is Fulfilled`) may have already called
// fetchComplete + fulfilled modulePromise inline while a require(esm)
// was draining the synchronous queue. The normal-queue copy of this
// reaction — queued when moduleRegistryFetchSettled ran earlier on
// the normal microtask queue — would otherwise re-enter fetchComplete
// and trip its "m_status == Fetching" assertion. Match the same
// pending-modulePromise guard used in moduleRegistryFetchSettled.
if (modulePromise->status() != JSPromise::Status::Pending)
return;
#endif
if (status == JSPromise::Status::Fulfilled) {
auto* moduleRecord = downcast<AbstractModuleRecord>(arguments[1]);
entry->fetchComplete(globalObject, moduleRecord);
Expand Down
Loading