Skip to content

[JSC] AbstractModuleRecord::link: one throw scope for the whole function #688

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 3 commits into from
Sep 17, 2026
Merged

[JSC] AbstractModuleRecord::link: one throw scope for the whole function #688

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2b2cd4
[JSC] AbstractModuleRecord::link: one throw scope for the whole function
dylan-conway Sep 17, 2026
ce115d0
Release the scope before the dispatch: SyntheticModuleRecord::link re…
dylan-conway Sep 17, 2026
c901df1
Check after each link() call instead of releasing the scope
dylan-conway Sep 17, 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
14 changes: 8 additions & 6 deletions Source/JavaScriptCore/runtime/AbstractModuleRecord.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1492,20 +1492,22 @@ void AbstractModuleRecord::setModuleEnvironment(JSGlobalObject* globalObject, JS

void AbstractModuleRecord::link(JSGlobalObject* globalObject, RefPtr<ScriptFetcher> scriptFetcher)
{
VM& vm = globalObject->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
#if USE(BUN_JSC_ADDITIONS)
{
VM& vm = globalObject->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
UncheckedKeyHashSet<AbstractModuleRecord*> visited;
generateDeferredSyntheticModules(globalObject, visited);
RETURN_IF_EXCEPTION(scope, void());
}
#endif
if (auto* cyclicModuleRecord = dynamicDowncast<CyclicModuleRecord>(this))
cyclicModuleRecord->link(globalObject, WTF::move(scriptFetcher)); // can throw
else if (auto* moduleRecord = dynamicDowncast<SyntheticModuleRecord>(this))
if (auto* cyclicModuleRecord = dynamicDowncast<CyclicModuleRecord>(this)) {
cyclicModuleRecord->link(globalObject, WTF::move(scriptFetcher));
RETURN_IF_EXCEPTION(scope, void());
} else if (auto* moduleRecord = dynamicDowncast<SyntheticModuleRecord>(this)) {
moduleRecord->link(globalObject, WTF::move(scriptFetcher));
else
RETURN_IF_EXCEPTION(scope, void());
} else
RELEASE_ASSERT_NOT_REACHED();
}

Expand Down
Loading