Oilpan: Query stack frame register instead of manual bookkeeping

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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef Visitor_h
 #define Visitor_h
 
 #include "platform/PlatformExport.h"
+#include "platform/heap/StackFrameDepth.h"
 #include "platform/heap/ThreadState.h"
 #include "wtf/Assertions.h"
 #include "wtf/Atomics.h"
 #include "wtf/Deque.h"
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashTraits.h"
 #include "wtf/InstanceCounter.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/RefPtr.h"
@@ skipping 574 matching lines @@
     virtual bool ensureMarked(const void*) = 0;
 
 #if ENABLE(GC_PROFILE_MARKING)
     void setHostInfo(void* object, const String& name)
     {
         m_hostObject = object;
         m_hostName = name;
     }
 #endif
 
-    inline bool canTraceEagerly() const { return m_traceDepth < kMaxEagerTraceDepth; }
-    inline void incrementTraceDepth() { m_traceDepth++; }
-    inline void decrementTraceDepth() { ASSERT(m_traceDepth > 0); m_traceDepth--; }
+    inline static bool canTraceEagerly()
+    {
+        ASSERT(m_stackFrameDepth);
+        return m_stackFrameDepth->isSafeToRecurse();
+    }
+
+    inline static void configureEagerTraceLimit()
+    {
+        if (!m_stackFrameDepth)
+            m_stackFrameDepth = new StackFrameDepth;
+        m_stackFrameDepth->configureLimit();
+    }
 
     inline bool isGlobalMarkingVisitor() const { return m_isGlobalMarkingVisitor; }
 
 protected:
     explicit Visitor(VisitorType type)
         : m_isGlobalMarkingVisitor(type == GlobalMarkingVisitorType)
-    {
-        m_traceDepth = 0;
-    }
+    { }
 
     virtual void registerWeakCellWithCallback(void**, WeakPointerCallback) = 0;
 #if ENABLE(GC_PROFILE_MARKING)
     virtual void recordObjectGraphEdge(const void*)
     {
         ASSERT_NOT_REACHED();
     }
 
     void* m_hostObject;
     String m_hostName;
 #endif
 
 private:
     static Visitor* fromHelper(VisitorHelper<Visitor>* helper) { return static_cast<Visitor*>(helper); }
+    static StackFrameDepth* m_stackFrameDepth;
 
-    // The maximum depth of eager, unrolled trace() calls that is
-    // considered safe and allowed.
-    const int kMaxEagerTraceDepth = 100;
-
-    static int m_traceDepth;
     bool m_isGlobalMarkingVisitor;
 };
 
 // We trace vectors by using the trace trait on each element, which means you
 // can have vectors of general objects (not just pointers to objects) that can
 // be traced.
 template<typename T, size_t N>
 struct OffHeapCollectionTraceTrait<WTF::Vector<T, N, WTF::DefaultAllocator> > {
     typedef WTF::Vector<T, N, WTF::DefaultAllocator> Vector;
 
@@ skipping 43 matching lines @@
         //
         // If the trait allows it, invoke the trace callback right here on the
         // not-yet-marked object.
         if (TraceEagerlyTrait<T>::value) {
             // Protect against too deep trace call chains, and the
             // unbounded system stack usage they can bring about.
             //
             // Assert against deep stacks so as to flush them out,
             // but test and appropriately handle them should they occur
             // in release builds.
-            ASSERT(visitor->canTraceEagerly());
+            ASSERT(visitor->canTraceEagerly() || visitor->isMarked(t));

[haraken, 2015/01/14 05:29:57]

visitor->isMarked(t) is just for weak processing in HashTable, right? Then add a
FIXME to remove this because we're planning to remove the hack from HashTable.

[sof, 2015/01/14 07:03:43]

Yes, an explanatory comment of the RHS of "||" would be in order regardless.

             if (LIKELY(visitor->canTraceEagerly())) {
                 if (visitor->ensureMarked(t)) {
-                    visitor->incrementTraceDepth();
                     TraceTrait<T>::trace(visitor, const_cast<T*>(t));
-                    visitor->decrementTraceDepth();
                 }
                 return;
             }
         }
         visitor->mark(const_cast<T*>(t), &TraceTrait<T>::trace);
     }
 
 #if ENABLE(ASSERT)
     static void checkGCInfo(const T* t)
     {
@@ skipping 181 matching lines @@
 struct GCInfoTrait {
     static size_t index()
     {
         return GCInfoAtBase<typename GetGarbageCollectedBase<T>::type>::index();
     }
 };
 
 }
 
 #endif