[wrapper-tracing] Simplify tracing by forbidding tracing from within mixins

third_party/WebKit/Source/platform/heap/TraceTraits.h

Index: third_party/WebKit/Source/platform/heap/TraceTraits.h
diff --git a/third_party/WebKit/Source/platform/heap/TraceTraits.h b/third_party/WebKit/Source/platform/heap/TraceTraits.h
index 01bfdd9627ecbbe3548db2d905a5538a14249686..cf0baa0c2390db65f8c5c8c8229b92eca8b49168 100644
--- a/third_party/WebKit/Source/platform/heap/TraceTraits.h
+++ b/third_party/WebKit/Source/platform/heap/TraceTraits.h
@@ -47,28 +47,6 @@ class AdjustAndMarkTrait<T, false> {
   STATIC_ONLY(AdjustAndMarkTrait);
 
  public:
-  static void markAndTraceWrapper(const WrapperVisitor* visitor, const T* t) {
-    if (visitor->markWrapperHeader(heapObjectHeader(t))) {
-      visitor->markWrappersInAllWorlds(t);
-      visitor->dispatchTraceWrappers(t);
-    }
-  }
-  static void markWrapperNoTracing(const WrapperVisitor* visitor, const T* t) {
-    DCHECK(!heapObjectHeader(t)->isWrapperHeaderMarked());
-    visitor->markWrapperHeader(heapObjectHeader(t));
-  }
-  static void traceMarkedWrapper(const WrapperVisitor* visitor, const T* t) {
-    DCHECK(heapObjectHeader(t)->isWrapperHeaderMarked());
-    // The term *mark* is misleading here as we effectively trace through the
-    // API boundary, i.e., tell V8 that an object is alive. Actual marking
-    // will be done in V8.
-    visitor->markWrappersInAllWorlds(t);
-    visitor->dispatchTraceWrappers(t);
-  }
-  static HeapObjectHeader* heapObjectHeader(const T* t) {
-    return HeapObjectHeader::fromPayload(t);
-  }
-
   template <typename VisitorDispatcher>
   static void mark(VisitorDispatcher visitor, const T* t) {
 #if ENABLE(ASSERT)
@@ -111,19 +89,6 @@ class AdjustAndMarkTrait<T, true> {
   STATIC_ONLY(AdjustAndMarkTrait);
 
  public:
-  static void markAndTraceWrapper(const WrapperVisitor* visitor, const T* t) {
-    t->adjustAndMarkAndTraceWrapper(visitor);
-  }
-  static void markWrapperNoTracing(const WrapperVisitor* visitor, const T* t) {
-    t->adjustAndMarkWrapperNoTracing(visitor);
-  }
-  static void traceMarkedWrapper(const WrapperVisitor* visitor, const T* t) {
-    t->adjustAndTraceMarkedWrapper(visitor);
-  }
-  static HeapObjectHeader* heapObjectHeader(const T* t) {
-    return t->adjustAndGetHeapObjectHeader();
-  }
-
   template <typename VisitorDispatcher>
   static void mark(VisitorDispatcher visitor, const T* self) {
     if (!self)
@@ -223,41 +188,28 @@ class TraceTrait {
   static void trace(Visitor*, void* self);
   static void trace(InlinedGlobalMarkingVisitor, void* self);
 
-  static void markAndTraceWrapper(const WrapperVisitor* visitor,
-                                  const void* t) {
-    static_assert(CanTraceWrappers<T>::value,
-                  "T should be able to trace wrappers. See "
-                  "dispatchTraceWrappers in WrapperVisitor.h");
-    AdjustAndMarkTrait<T>::markAndTraceWrapper(visitor,
-                                               reinterpret_cast<const T*>(t));
-  }
-  static void markWrapperNoTracing(const WrapperVisitor* visitor,
-                                   const void* t) {
-    static_assert(CanTraceWrappers<T>::value,
-                  "T should be able to trace wrappers. See "
-                  "dispatchTraceWrappers in WrapperVisitor.h");
-    AdjustAndMarkTrait<T>::markWrapperNoTracing(visitor,
-                                                reinterpret_cast<const T*>(t));
-  }
-  static void traceMarkedWrapper(const WrapperVisitor* visitor, const void* t) {
-    static_assert(CanTraceWrappers<T>::value,
-                  "T should be able to trace wrappers. See "
-                  "dispatchTraceWrappers in WrapperVisitor.h");
-    AdjustAndMarkTrait<T>::traceMarkedWrapper(visitor,
-                                              reinterpret_cast<const T*>(t));
-  }
-  static HeapObjectHeader* heapObjectHeader(const void* t) {
-    static_assert(CanTraceWrappers<T>::value,
-                  "T should be able to trace wrappers. See "
-                  "dispatchTraceWrappers in WrapperVisitor.h");
-    return AdjustAndMarkTrait<T>::heapObjectHeader(
-        reinterpret_cast<const T*>(t));
-  }
+  static void markAndTraceWrapper(const WrapperVisitor*, const void*);
+  static void markWrapperNoTracing(const WrapperVisitor*, const void*);
+  static void traceMarkedWrapper(const WrapperVisitor*, const void*);
+  static HeapObjectHeader* heapObjectHeader(const void*);
 
   template <typename VisitorDispatcher>
   static void mark(VisitorDispatcher visitor, const T* t) {
     AdjustAndMarkTrait<T>::mark(visitor, t);
   }
+
+ private:
+  static const T* ToWrapperTracingType(const void* t) {
+    static_assert(CanTraceWrappers<T>::value,
+                  "T should be able to trace wrappers. See "
+                  "dispatchTraceWrappers in WrapperVisitor.h");
+    static_assert(!NeedsAdjustAndMark<T>::value,
+                  "wrapper tracing is not supported within mixins");
+#if DCHECK_IS_ON()
+    DCHECK(HeapObjectHeader::fromPayload(t)->checkHeader());
+#endif
+    return reinterpret_cast<const T*>(t);
+  }
 };
 
 template <typename T>
@@ -281,6 +233,41 @@ void TraceTrait<T>::trace(InlinedGlobalMarkingVisitor visitor, void* self) {
   static_cast<T*>(self)->trace(visitor);
 }
 
+template <typename T>
+void TraceTrait<T>::markAndTraceWrapper(const WrapperVisitor* visitor,
+                                        const void* t) {
+  const T* traceable = ToWrapperTracingType(t);
+  if (visitor->markWrapperHeader(heapObjectHeader(traceable))) {
+    visitor->markWrappersInAllWorlds(traceable);
+    visitor->dispatchTraceWrappers(traceable);
+  }
+}
+
+template <typename T>
+void TraceTrait<T>::markWrapperNoTracing(const WrapperVisitor* visitor,
+                                         const void* t) {
+  const T* traceable = ToWrapperTracingType(t);
+  DCHECK(!heapObjectHeader(traceable)->isWrapperHeaderMarked());
+  visitor->markWrapperHeader(heapObjectHeader(traceable));
+}
+
+template <typename T>
+void TraceTrait<T>::traceMarkedWrapper(const WrapperVisitor* visitor,
+                                       const void* t) {
+  const T* traceable = ToWrapperTracingType(t);
+  DCHECK(heapObjectHeader(t)->isWrapperHeaderMarked());
+  // The term *mark* is misleading here as we effectively trace through the
+  // API boundary, i.e., tell V8 that an object is alive. Actual marking
+  // will be done in V8.
+  visitor->markWrappersInAllWorlds(traceable);
+  visitor->dispatchTraceWrappers(traceable);
+}
+
+template <typename T>
+HeapObjectHeader* TraceTrait<T>::heapObjectHeader(const void* t) {
+  return HeapObjectHeader::fromPayload(ToWrapperTracingType(t));
+}
+
 template <typename T, typename Traits>
 struct TraceTrait<HeapVectorBacking<T, Traits>> {
   STATIC_ONLY(TraceTrait);