Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (87315 => 87316)
--- trunk/Source/_javascript_Core/ChangeLog 2011-05-25 19:28:22 UTC (rev 87315)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-05-25 19:37:18 UTC (rev 87316)
@@ -1,3 +1,22 @@
+2011-05-24 Geoffrey Garen <[email protected]>
+
+ 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 <[email protected]>
Reviewed by Geoffrey Garen.
Modified: trunk/Source/_javascript_Core/heap/MarkStack.h (87315 => 87316)
--- trunk/Source/_javascript_Core/heap/MarkStack.h 2011-05-25 19:28:22 UTC (rev 87315)
+++ trunk/Source/_javascript_Core/heap/MarkStack.h 2011-05-25 19:37:18 UTC (rev 87316)
@@ -43,14 +43,11 @@
class Register;
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;
};
template<typename T> class MarkStackArray {
@@ -90,7 +87,7 @@
void append(ConservativeRoots&);
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*);
bool containsOpaqueRoot(void*);
@@ -155,10 +152,9 @@
return m_opaqueRoots.size();
}
- 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);
}
@@ -251,7 +247,7 @@
#if ENABLE(GC_VALIDATION)
validateSet(slot, count);
#endif
- m_markSets.append(MarkSet(slot, slot + count, NoNullValues));
+ m_markSets.append(MarkSet(slot, slot + count));
}
ALWAYS_INLINE void MarkStack::append(JSValue* value)
Modified: trunk/Source/_javascript_Core/runtime/JSActivation.cpp (87315 => 87316)
--- trunk/Source/_javascript_Core/runtime/JSActivation.cpp 2011-05-25 19:28:22 UTC (rev 87315)
+++ trunk/Source/_javascript_Core/runtime/JSActivation.cpp 2011-05-25 19:37:18 UTC (rev 87316)
@@ -73,7 +73,7 @@
visitor.appendValues(registerArray, m_numParametersMinusThis);
// 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);
}
inline bool JSActivation::symbolTableGet(const Identifier& propertyName, PropertySlot& slot)
Modified: trunk/Source/_javascript_Core/runtime/JSArray.h (87315 => 87316)
--- trunk/Source/_javascript_Core/runtime/JSArray.h 2011-05-25 19:28:22 UTC (rev 87315)
+++ trunk/Source/_javascript_Core/runtime/JSArray.h 2011-05-25 19:37:18 UTC (rev 87316)
@@ -192,7 +192,7 @@
ArrayStorage* storage = m_storage;
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) {
SparseArrayValueMap::iterator end = map->end();
Modified: trunk/Source/_javascript_Core/runtime/JSPropertyNameIterator.cpp (87315 => 87316)
--- trunk/Source/_javascript_Core/runtime/JSPropertyNameIterator.cpp 2011-05-25 19:28:22 UTC (rev 87315)
+++ trunk/Source/_javascript_Core/runtime/JSPropertyNameIterator.cpp 2011-05-25 19:37:18 UTC (rev 87316)
@@ -99,7 +99,7 @@
{
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);
}
Modified: trunk/Source/_javascript_Core/runtime/WriteBarrier.h (87315 => 87316)
--- trunk/Source/_javascript_Core/runtime/WriteBarrier.h 2011-05-25 19:28:22 UTC (rev 87315)
+++ trunk/Source/_javascript_Core/runtime/WriteBarrier.h 2011-05-25 19:37:18 UTC (rev 87316)
@@ -234,14 +234,14 @@
internalAppend(*slot->slot());
}
-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();
#if ENABLE(GC_VALIDATION)
validateSet(values, count);
#endif
if (count)
- m_markSets.append(MarkSet(values, values + count, properties));
+ m_markSets.append(MarkSet(values, values + count));
}
} // namespace JSC
