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

Source/platform/heap/Visitor.h

 /*
  * Copyright (C) 2013 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 589 matching lines @@
         visitor->checkGCInfo(const_cast<T*>(t), GCInfoTrait<T>::get());
     }
 #endif
 };
 
 template<typename T>
 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
     static void checkGCInfo(Visitor*, const T*) { }
 #endif
 };
 
 template<typename T, bool = NeedsAdjustAndMark<T>::value> class DefaultObjectAliveTrait;
 
 template<typename T>
@@ skipping 111 matching lines @@
 struct GCInfoTrait {
     static const GCInfo* get()
     {
         return GCInfoAtBase<typename GetGarbageCollectedBase<T>::type>::get();
     }
 };
 
 }
 
 #endif