Changeset 184050 in webkit for trunk/Source/JavaScriptCore/runtime/PropertyNameArray.cpp

Timestamp:

May 10, 2015, 1:03:57 PM (10 years ago)

Author:

[email protected]

Message:

Remove unused things from PropertyNameArray.
<​https://webkit.org/b/144834>

Reviewed by Filip Pizlo.

PropertyNameArray had a bunch of bells and whistles added to it when for-in iteration
was refactored and optimized last year. Then more refactoring happened and this class
doesn't need to ring and toot anymore.

The RefCountedIdentifierSet class disappears since the JSPropertyNameEnumerator wasn't
actually using it for anything and we were just wasting time creating these.

Also made the member functions take AtomicStringImpl* instead of plain StringImpl*.

• runtime/JSObject.cpp:

(JSC::JSObject::getPropertyNames):

• runtime/JSPropertyNameEnumerator.cpp:

(JSC::JSPropertyNameEnumerator::create):
(JSC::JSPropertyNameEnumerator::JSPropertyNameEnumerator):

• runtime/JSPropertyNameEnumerator.h:
• runtime/PropertyNameArray.cpp:

(JSC::PropertyNameArray::add):
(JSC::PropertyNameArray::setPreviouslyEnumeratedProperties): Deleted.

• runtime/PropertyNameArray.h:

(JSC::PropertyNameArray::PropertyNameArray):
(JSC::PropertyNameArray::add):
(JSC::PropertyNameArray::addKnownUnique):
(JSC::PropertyNameArray::canAddKnownUniqueForStructure):
(JSC::RefCountedIdentifierSet::contains): Deleted.
(JSC::RefCountedIdentifierSet::size): Deleted.
(JSC::RefCountedIdentifierSet::add): Deleted.
(JSC::PropertyNameArray::identifierSet): Deleted.
(JSC::PropertyNameArray::numCacheableSlots): Deleted.
(JSC::PropertyNameArray::setNumCacheableSlotsForObject): Deleted.
(JSC::PropertyNameArray::setBaseObject): Deleted.
(JSC::PropertyNameArray::setPreviouslyEnumeratedLength): Deleted.

File:

• trunk/Source/JavaScriptCore/runtime/PropertyNameArray.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/PropertyNameArray.cpp

@@ -30 +30 @@
 namespace JSC {
 
-void PropertyNameArray::add(StringImpl* identifier)
+void PropertyNameArray::add(AtomicStringImpl* identifier)
 {
-    ASSERT(!identifier || (identifier == StringImpl::empty() || identifier->isAtomic() || identifier->isSymbol()));
-    if (!ASSERT_DISABLED) {
-        Optional<uint32_t> index = parseIndex(Identifier::fromUid(m_vm, identifier));
-        ASSERT_UNUSED(index, !index || index.value() >= m_previouslyEnumeratedLength);
-    }
+    ASSERT(identifier);
 
-    if (m_alternateSet && m_alternateSet->contains(identifier))
-        return;
-
-    if (!m_set->add(identifier).isNewEntry)
+    if (!m_set.add(identifier).isNewEntry)
         return;
 
@@ -47 +40 @@
 }
 
-void PropertyNameArray::setPreviouslyEnumeratedProperties(const JSPropertyNameEnumerator* enumerator)
-{
-    m_alternateSet = enumerator->identifierSet();
-}
-
 } // namespace JSC