--- a/xpcom/threads/ThreadEventTarget.cpp
+++ b/xpcom/threads/ThreadEventTarget.cpp
@@ -89,17 +89,17 @@ NS_IMPL_ISUPPORTS_INHERITED(DelayedRunna
ThreadEventTarget::ThreadEventTarget(ThreadTargetSink* aSink,
bool aIsMainThread)
: mSink(aSink), mIsMainThread(aIsMainThread) {
mThread = PR_GetCurrentThread();
}
void ThreadEventTarget::SetCurrentThread() { mThread = PR_GetCurrentThread(); }
-void ThreadEventTarget::ClearCurrentThread() { mVirtualThread = nullptr; }
+void ThreadEventTarget::ClearCurrentThread() { mThread = nullptr; }
NS_IMPL_ISUPPORTS(ThreadEventTarget, nsIEventTarget, nsISerialEventTarget)
NS_IMETHODIMP
ThreadEventTarget::DispatchFromScript(nsIRunnable* aRunnable, uint32_t aFlags) {
return Dispatch(do_AddRef(aRunnable), aFlags);
}
--- a/xpcom/threads/nsThread.cpp
+++ b/xpcom/threads/nsThread.cpp
@@ -502,17 +502,16 @@ void nsThread::ThreadFunc(void* aArg) {
self->SetObserver(nullptr);
#ifdef MOZ_TASK_TRACER
FreeTraceInfo();
#endif
// The PRThread will be deleted in PR_JoinThread(), so clear references.
self->mThread = nullptr;
- self->mVirtualThread = nullptr;
self->mEventTarget->ClearCurrentThread();
NS_RELEASE(self);
}
void nsThread::InitCommon() {
mThreadId = uint32_t(PlatformThread::CurrentId());
{