diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /js/loader/ModuleLoaderBase.cpp | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'js/loader/ModuleLoaderBase.cpp')
| -rw-r--r-- | js/loader/ModuleLoaderBase.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/js/loader/ModuleLoaderBase.cpp b/js/loader/ModuleLoaderBase.cpp index 59e77b2d9c..228c96ad69 100644 --- a/js/loader/ModuleLoaderBase.cpp +++ b/js/loader/ModuleLoaderBase.cpp @@ -969,7 +969,12 @@ void ModuleLoaderBase::FinishDynamicImport( LOG(("ScriptLoadRequest (%p): Finish dynamic import %x %d", aRequest, 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 // 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, 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); if (!aRequest->IsCanceled()) { |