Changeset 87316 in webkit

Timestamp:

May 25, 2011 12:37:18 PM (13 years ago)

Author:

ggaren@apple.com

Message:

2011-05-24 Geoffrey Garen <​ggaren@apple.com>

Reviewed by Geoffrey Garen.

Removed MarkSetProperties because it was unused
​https://bugs.webkit.org/show_bug.cgi?id=61418

• heap/MarkStack.h: (JSC::MarkSet::MarkSet): (JSC::MarkStack::append):
• runtime/JSActivation.cpp: (JSC::JSActivation::visitChildren):
• runtime/JSArray.h: (JSC::JSArray::visitChildrenDirect):
• runtime/JSPropertyNameIterator.cpp: (JSC::JSPropertyNameIterator::visitChildren):
• runtime/WriteBarrier.h: (JSC::MarkStack::appendValues):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/MarkStack.h (modified) (4 diffs)
• runtime/JSActivation.cpp (modified) (1 diff)
• runtime/JSArray.h (modified) (1 diff)
• runtime/JSPropertyNameIterator.cpp (modified) (1 diff)
• runtime/WriteBarrier.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-05-24  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        Removed MarkSetProperties because it was unused
+        https://bugs.webkit.org/show_bug.cgi?id=61418
+
+        * heap/MarkStack.h:
+        (JSC::MarkSet::MarkSet):
+        (JSC::MarkStack::append):
+        * runtime/JSActivation.cpp:
+        (JSC::JSActivation::visitChildren):
+        * runtime/JSArray.h:
+        (JSC::JSArray::visitChildrenDirect):
+        * runtime/JSPropertyNameIterator.cpp:
+        (JSC::JSPropertyNameIterator::visitChildren):
+        * runtime/WriteBarrier.h:
+        (JSC::MarkStack::appendValues):
+
 2011-05-25  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/heap/MarkStack.h

@@ -44 +44 @@
     template<typename T> class WriteBarrierBase;
     
-    enum MarkSetProperties { MayContainNullValues, NoNullValues };
-    
     struct MarkSet {
-        MarkSet(JSValue* values, JSValue* end, MarkSetProperties);
+        MarkSet(JSValue* values, JSValue* end);
 
         JSValue* m_values;
         JSValue* m_end;
-        MarkSetProperties m_properties;
     };
 
@@ -91 +88 @@
 
         template<typename T> inline void append(WriteBarrierBase<T>*);
-        inline void appendValues(WriteBarrierBase<Unknown>*, size_t count, MarkSetProperties = NoNullValues);
+        inline void appendValues(WriteBarrierBase<Unknown>*, size_t count);
         
         bool addOpaqueRoot(void*);
@@ -156 +153 @@
     }
 
-    inline MarkSet::MarkSet(JSValue* values, JSValue* end, MarkSetProperties properties)
+    inline MarkSet::MarkSet(JSValue* values, JSValue* end)
             : m_values(values)
             , m_end(end)
-            , m_properties(properties)
         {
             ASSERT(values);
@@ -252 +248 @@
         validateSet(slot, count);
 #endif
-        m_markSets.append(MarkSet(slot, slot + count, NoNullValues));
+        m_markSets.append(MarkSet(slot, slot + count));
     }
     

trunk/Source/JavaScriptCore/runtime/JSActivation.cpp

@@ -74 +74 @@
 
     // Skip the call frame, which sits between the parameters and vars.
-    visitor.appendValues(registerArray + m_numParametersMinusThis + RegisterFile::CallFrameHeaderSize, m_numCapturedVars, MayContainNullValues);
+    visitor.appendValues(registerArray + m_numParametersMinusThis + RegisterFile::CallFrameHeaderSize, m_numCapturedVars);
 }
 

trunk/Source/JavaScriptCore/runtime/JSArray.h

@@ -193 +193 @@
 
         unsigned usedVectorLength = std::min(storage->m_length, m_vectorLength);
-        visitor.appendValues(storage->m_vector, usedVectorLength, MayContainNullValues);
+        visitor.appendValues(storage->m_vector, usedVectorLength);
 
         if (SparseArrayValueMap* map = storage->m_sparseValueMap) {

trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.cpp

@@ -100 +100 @@
     ASSERT_GC_OBJECT_INHERITS(this, &s_info);
     ASSERT(structure()->typeInfo().overridesVisitChildren());
-    visitor.appendValues(m_jsStrings.get(), m_jsStringsSize, MayContainNullValues);
+    visitor.appendValues(m_jsStrings.get(), m_jsStringsSize);
     if (m_cachedPrototypeChain)
         visitor.append(&m_cachedPrototypeChain);

trunk/Source/JavaScriptCore/runtime/WriteBarrier.h

@@ -235 +235 @@
 }
 
-inline void MarkStack::appendValues(WriteBarrierBase<Unknown>* barriers, size_t count, MarkSetProperties properties)
+inline void MarkStack::appendValues(WriteBarrierBase<Unknown>* barriers, size_t count)
 {
     JSValue* values = barriers->slot();
@@ -242 +242 @@
 #endif
     if (count)
-        m_markSets.append(MarkSet(values, values + count, properties));
+        m_markSets.append(MarkSet(values, values + count));
 }