Bug 1373914. P3 - dump sInitPhase when sInstance is null in Instance() to help debugging.
MozReview-Commit-ID: dI85veNOKz
--- a/dom/media/MediaShutdownManager.cpp
+++ b/dom/media/MediaShutdownManager.cpp
@@ -37,17 +37,21 @@ MediaShutdownManager::~MediaShutdownMana
StaticRefPtr<MediaShutdownManager> MediaShutdownManager::sInstance;
MediaShutdownManager::InitPhase MediaShutdownManager::sInitPhase = MediaShutdownManager::NotInited;
MediaShutdownManager&
MediaShutdownManager::Instance()
{
MOZ_ASSERT(NS_IsMainThread());
- MOZ_DIAGNOSTIC_ASSERT(sInstance);
+#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
+ if (!sInstance) {
+ MOZ_CRASH_UNSAFE_PRINTF("sInstance is null. sInitPhase=%d", int(sInitPhase));
+ }
+#endif
return *sInstance;
}
static nsCOMPtr<nsIAsyncShutdownClient>
GetShutdownBarrier()
{
nsCOMPtr<nsIAsyncShutdownService> svc = services::GetAsyncShutdown();
MOZ_RELEASE_ASSERT(svc);