Revert "Revert "[oilpan]: Make thread shutdown more robust.""

Source/platform/heap/Visitor.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 25 matching lines @@
 
 namespace WebCore {
 
 #ifndef NDEBUG
 void Visitor::checkGCInfo(const void* payload, const GCInfo* gcInfo)
 {
     FinalizedHeapObjectHeader::fromPayload(payload)->checkHeader();
 #if !defined(COMPONENT_BUILD)
     // On component builds we cannot compare the gcInfos as they are statically
     // defined in each of the components and hence will not match.
-    ASSERT(FinalizedHeapObjectHeader::fromPayload(payload)->gcInfo() == gcInfo);
+    BaseHeapPage* page = pageHeaderFromObject(payload);
+    ASSERT(page->orphaned() || FinalizedHeapObjectHeader::fromPayload(payload)->gcInfo() == gcInfo);
 #endif
 }
 
-#define DEFINE_VISITOR_CHECK_MARKER(Type)                                    \
-    void Visitor::checkGCInfo(const Type* payload, const GCInfo* gcInfo)     \
-    {                                                                        \
-        HeapObjectHeader::fromPayload(payload)->checkHeader();               \
-        Type* object = const_cast<Type*>(payload);                           \
-        Address addr = pageHeaderAddress(reinterpret_cast<Address>(object)); \
-        BaseHeapPage* page = reinterpret_cast<BaseHeapPage*>(addr);          \
-        ASSERT(page->gcInfo() == gcInfo);                                    \
+#define DEFINE_VISITOR_CHECK_MARKER(Type)                                \
+    void Visitor::checkGCInfo(const Type* payload, const GCInfo* gcInfo) \
+    {                                                                    \
+        HeapObjectHeader::fromPayload(payload)->checkHeader();           \
+        Type* object = const_cast<Type*>(payload);                       \
+        BaseHeapPage* page = pageHeaderFromObject(object);               \
+        ASSERT(page->orphaned() || page->gcInfo() == gcInfo);            \
     }
 
 FOR_EACH_TYPED_HEAP(DEFINE_VISITOR_CHECK_MARKER)
 #undef DEFINE_VISITOR_CHECK_MARKER
 #endif
 
 }