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

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: remove redundant NO_SANITIZE_ADDRESS 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
Index: Source/platform/heap/Visitor.h
diff --git a/Source/platform/heap/Visitor.h b/Source/platform/heap/Visitor.h
index ffadc80fe99aa42561c757d29f9432d498d39a52..e1c93500db7e20d70b8994e3b820d3e85ced0145 100644
--- a/Source/platform/heap/Visitor.h
+++ b/Source/platform/heap/Visitor.h
@@ -594,8 +594,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

Powered by Google App Engine
This is Rietveld 408576698