Changeset 37300 in webkit for trunk/JavaScriptCore/kjs/StructureID.cpp

Timestamp:

Oct 4, 2008, 2:57:26 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-04 Sam Weinig <​[email protected]>

Reviewed by Oliver Hunt.

Fix ​https://bugs.webkit.org/show_bug.cgi?id=21320
leaks of PropertyNameArrayData seen on buildbot

• Fix RefPtr cycle by making PropertyNameArrayData's pointer back to the StructureID a weak pointer.

• kjs/PropertyNameArray.h: (JSC::PropertyNameArrayData::setCachedStructureID): (JSC::PropertyNameArrayData::cachedStructureID):
• kjs/StructureID.cpp: (JSC::StructureID::getEnumerablePropertyNames): (JSC::StructureID::clearEnumerationCache): (JSC::StructureID::~StructureID):

File:

• trunk/JavaScriptCore/kjs/StructureID.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/StructureID.cpp

@@ -82 +82 @@
 
     if (shouldCache) {
+        if (m_cachedPropertyNameArrayData)
+            m_cachedPropertyNameArrayData->setCachedStructureID(0);
+
         m_cachedPropertyNameArrayData = propertyNames.data();
 
@@ -94 +97 @@
 void StructureID::clearEnumerationCache()
 {
+    if (m_cachedPropertyNameArrayData)
+        m_cachedPropertyNameArrayData->setCachedStructureID(0);
     m_cachedPropertyNameArrayData.clear();
 }
@@ -183 +188 @@
         m_previous->m_transitionTable.remove(make_pair(m_nameInPrevious, m_attributesInPrevious));
     }
+
+    if (m_cachedPropertyNameArrayData)
+        m_cachedPropertyNameArrayData->setCachedStructureID(0);
 }