nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1880708 - Handle CC unlink when destroying ScriptLoader/ModuleLoader. r=jonco

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D202080
This commit is contained in:
Tooru Fujisawa 2024-02-19 15:09:00 +00:00
parent 3bf0a840e4
commit 7533056300
3 changed files with 25 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

15
js/loader/ModuleLoadRequest.cpp
View file

@ -27,6 +27,9 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(ModuleLoadRequest)
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(ModuleLoadRequest, NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(ModuleLoadRequest,
ScriptLoadRequest) ScriptLoadRequest)
if (tmp->mWaitingParentRequest) {
tmp->mWaitingParentRequest->ChildModuleUnlinked();
}
NS_IMPL_CYCLE_COLLECTION_UNLINK(mLoader, mRootModule, mModuleScript, mImports, NS_IMPL_CYCLE_COLLECTION_UNLINK(mLoader, mRootModule, mModuleScript, mImports,
mWaitingParentRequest, mWaitingParentRequest,
mDynamicReferencingScript) mDynamicReferencingScript)
@ -230,6 +233,18 @@ void ModuleLoadRequest::LoadFinished() {
mLoader->OnModuleLoadComplete(request); mLoader->OnModuleLoadComplete(request);
} }
void ModuleLoadRequest::ChildModuleUnlinked() {
// This module was waiting for a child request, but the child reqeust
// got unlinked by CC and will never complete.
// It also means this module itself is also in the cycle, and will be
// unlinked or has already been unlinked, and will be collected.
// There's no need to normally finish the module request.
// Just reflect the awaiting imports count, so that the assertion in the
// destructor passes.
MOZ_ASSERT(mAwaitingImports > 0);
mAwaitingImports--;
}
void ModuleLoadRequest::SetDynamicImport(LoadedScript* aReferencingScript, void ModuleLoadRequest::SetDynamicImport(LoadedScript* aReferencingScript,
JS::Handle<JSString*> aSpecifier, JS::Handle<JSString*> aSpecifier,
JS::Handle<JSObject*> aPromise) { JS::Handle<JSObject*> aPromise) {

2
js/loader/ModuleLoadRequest.h
View file

@ -125,6 +125,8 @@ class ModuleLoadRequest final : public ScriptLoadRequest {
void CancelImports(); void CancelImports();
void CheckModuleDependenciesLoaded(); void CheckModuleDependenciesLoaded();
void ChildModuleUnlinked();
void AssertAllImportsFinished() const; void AssertAllImportsFinished() const;
void AssertAllImportsCancelled() const; void AssertAllImportsCancelled() const;

10
js/loader/ModuleLoaderBase.cpp
View file

@ -969,7 +969,12 @@ void ModuleLoaderBase::FinishDynamicImport(
LOG(("ScriptLoadRequest (%p): Finish dynamic import %x %d", aRequest, LOG(("ScriptLoadRequest (%p): Finish dynamic import %x %d", aRequest,
unsigned(aResult), JS_IsExceptionPending(aCx))); unsigned(aResult), JS_IsExceptionPending(aCx)));
MOZ_ASSERT(GetCurrentModuleLoader(aCx) == aRequest->mLoader); MOZ_ASSERT_IF(NS_SUCCEEDED(aResult),
GetCurrentModuleLoader(aCx) == aRequest->mLoader);
// For failure case, aRequest may have already been unlinked by CC.
MOZ_ASSERT_IF(
NS_FAILED(aResult),
GetCurrentModuleLoader(aCx) == aRequest->mLoader || !aRequest->mLoader);
// If aResult is a failed result, we don't have an EvaluationPromise. If it // If aResult is a failed result, we don't have an EvaluationPromise. If it
// succeeded, evaluationPromise may still be null, but in this case it will // succeeded, evaluationPromise may still be null, but in this case it will
@ -1057,7 +1062,8 @@ bool ModuleLoaderBase::HasPendingDynamicImports() const {
void ModuleLoaderBase::CancelDynamicImport(ModuleLoadRequest* aRequest, void ModuleLoaderBase::CancelDynamicImport(ModuleLoadRequest* aRequest,
nsresult aResult) { nsresult aResult) {
MOZ_ASSERT(aRequest->mLoader == this); // aRequest may have already been unlinked by CC.
MOZ_ASSERT(aRequest->mLoader == this || !aRequest->mLoader);
RefPtr<ScriptLoadRequest> req = mDynamicImportRequests.Steal(aRequest); RefPtr<ScriptLoadRequest> req = mDynamicImportRequests.Steal(aRequest);
if (!aRequest->IsCanceled()) { if (!aRequest->IsCanceled()) {