Changeset 77151 in webkit for trunk/Source/JavaScriptCore/runtime/MarkStack.h

Timestamp:

Jan 31, 2011, 12:07:21 PM (14 years ago)

Author:

[email protected]

Message:

2011-01-31 Oliver Hunt <​[email protected]>

Convert markstack to a slot visitor API
​https://bugs.webkit.org/show_bug.cgi?id=53219

rolling r77098, r77099, r77100, r77109, and
r77111 back in, along with a few more Qt fix attempts.

File:

• trunk/Source/JavaScriptCore/runtime/MarkStack.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/MarkStack.h

@@ -28 +28 @@
 
 #include "JSValue.h"
+#include "WriteBarrier.h"
 #include <wtf/Vector.h>
 #include <wtf/Noncopyable.h>
@@ -50 +51 @@
         {
         }
-
-        ALWAYS_INLINE void append(JSValue);
-        void append(JSCell*);
         
-        ALWAYS_INLINE void appendValues(Register* values, size_t count, MarkSetProperties properties = NoNullValues)
-        {
-            appendValues(reinterpret_cast<JSValue*>(values), count, properties);
-        }
-
-        ALWAYS_INLINE void appendValues(JSValue* values, size_t count, MarkSetProperties properties = NoNullValues)
-        {
+        void deprecatedAppend(JSValue*);
+        void deprecatedAppend(JSCell**);
+        void deprecatedAppend(Register*);
+        template <typename T> void append(WriteBarrierBase<T>*);
+        template <typename T> void append(DeprecatedPtr<T>*);
+        
+        ALWAYS_INLINE void deprecatedAppendValues(Register* registers, size_t count, MarkSetProperties properties = NoNullValues)
+        {
+            JSValue* values = reinterpret_cast<JSValue*>(registers);
             if (count)
                 m_markSets.append(MarkSet(values, values + count, properties));
         }
 
+        void appendValues(WriteBarrierBase<Unknown>* barriers, size_t count, MarkSetProperties properties = NoNullValues)
+        {
+            JSValue* values = barriers->slot();
+            if (count)
+                m_markSets.append(MarkSet(values, values + count, properties));
+        }
+
         inline void drain();
         void compact();
@@ -75 +82 @@
 
     private:
+        void internalAppend(JSCell*);
+        void internalAppend(JSValue);
         void markChildren(JSCell*);