Changeset 37300 in webkit

Timestamp:

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

Author:

weinig@apple.com

Message:

2008-10-04 Sam Weinig <​sam@webkit.org>

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):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/PropertyNameArray.h (modified) (2 diffs)
• kjs/StructureID.cpp (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-04  Sam Weinig  <sam@webkit.org>
+
+        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):
+
 2008-10-04  Darin Adler  <darin@apple.com>
 

trunk/JavaScriptCore/kjs/PropertyNameArray.h

@@ -42 +42 @@
         PropertyNameVector& propertyNameVector() { return m_propertyNameVector; }
 
-        void setCachedStructureID(PassRefPtr<StructureID> structureID) { m_cachedStructureID = structureID; }
-        StructureID* cachedStructureID() const { return m_cachedStructureID.get(); }
+        void setCachedStructureID(StructureID* structureID) { m_cachedStructureID = structureID; }
+        StructureID* cachedStructureID() const { return m_cachedStructureID; }
 
         void setCachedPrototypeChain(PassRefPtr<StructureIDChain> cachedPrototypeChain) { m_cachedPrototypeChain = cachedPrototypeChain; }
@@ -50 +50 @@
     private:
         PropertyNameArrayData()
+            : m_cachedStructureID(0)
         {
         }
 
         PropertyNameVector m_propertyNameVector;
-        RefPtr<StructureID> m_cachedStructureID;
+        StructureID* m_cachedStructureID;
         RefPtr<StructureIDChain> m_cachedPrototypeChain;
     };

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);
 }