Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(247)

Unified Diff: Source/platform/heap/Visitor.h

Issue 393823003: Revert "Revert "[oilpan]: Make thread shutdown more robust."" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/heap/ThreadState.cpp ('k') | Source/platform/heap/Visitor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/heap/Visitor.h
diff --git a/Source/platform/heap/Visitor.h b/Source/platform/heap/Visitor.h
index a14aadfcddc0ac2885be3f0befe58ae8a1bdba45..721793384a2d4f3ca1317d4644352e3ad1fb648a 100644
--- a/Source/platform/heap/Visitor.h
+++ b/Source/platform/heap/Visitor.h
@@ -607,8 +607,18 @@ class DefaultTraceTrait<T, true> {
public:
static void mark(Visitor* visitor, const T* self)
{
- if (self)
- self->adjustAndMark(visitor);
+ if (!self)
+ return;
+
+ // Before doing adjustAndMark we need to check if the page is orphaned
+ // since we cannot call adjustAndMark if so, as there will be no vtable.
+ // If orphaned just mark the page as traced.
+ BaseHeapPage* heapPage = pageHeaderFromObject(self);
+ if (heapPage->orphaned()) {
+ heapPage->setTracedAfterOrphaned();
+ return;
+ }
+ self->adjustAndMark(visitor);
}
#ifndef NDEBUG
« no previous file with comments | « Source/platform/heap/ThreadState.cpp ('k') | Source/platform/heap/Visitor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698