Oilpan: Query stack frame register instead of manual bookkeeping

Source/platform/heap/Visitor.h

Index: Source/platform/heap/Visitor.h
diff --git a/Source/platform/heap/Visitor.h b/Source/platform/heap/Visitor.h
index d000afcb73de51916524129c0cf529201cb7a355..6eafcc2b2a8eb9f1cdcda3d1495e760e7ed9373a 100644
--- a/Source/platform/heap/Visitor.h
+++ b/Source/platform/heap/Visitor.h
@@ -32,6 +32,7 @@
 #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"
@@ -626,18 +627,25 @@ public:
     }
 #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)
@@ -652,12 +660,8 @@ protected:
 
 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;
 };
 
@@ -721,12 +725,10 @@ public:
             // 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;
             }