Skip to content
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

clear expirableObjectDisposeList at the end of disposal all objects #2739

Merged
merged 1 commit into from
Mar 28, 2017
Merged

clear expirableObjectDisposeList at the end of disposal all objects #2739

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions lib/Runtime/Base/ThreadContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1838,6 +1838,7 @@ void ThreadContext::DisposeOnLeaveScript()
if (this->callDispose && this->recycler->NeedDispose())
{
this->recycler->FinishDisposeObjectsNow<FinishDispose>();
this->expirableObjectDisposeList->Clear();
}
}

Expand Down Expand Up @@ -3017,10 +3018,9 @@ ThreadContext::UnregisterExpirableObject(ExpirableObject* object)
void
ThreadContext::DisposeExpirableObject(ExpirableObject* object)
{
Assert(this->expirableObjectDisposeList);
Assert(object->registrationHandle == nullptr);

this->expirableObjectDisposeList->Remove(object);
//expirableObjectDisposeList will be cleared after finished disposing all objects

OUTPUT_VERBOSE_TRACE(Js::ExpirableCollectPhase, _u("Disposed 0x%p\n"), object);
}
Expand Down