Changeset 39956 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Jan 15, 2009, 4:53:41 PM (16 years ago)

Author:

[email protected]

Message:

2009-01-15 Sam Weinig <​[email protected]>

Reviewed by Geoffrey Garen.

<rdar://problem/6045018>
REGRESSION (r34838): JavaScript objects appear to be leaked after loading google.com

Subtract the number of JSStrings cached in SmallStrings when calculating the
number of live JSObjects.

• runtime/Collector.cpp: (JSC::Heap::objectCount):
• runtime/SmallStrings.cpp: (JSC::SmallStrings::count):
• runtime/SmallStrings.h:

Location:

trunk/JavaScriptCore/runtime

Files:

• Collector.cpp (modified) (1 diff)
• SmallStrings.cpp (modified) (1 diff)
• SmallStrings.h (modified) (1 diff)

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -1006 +1006 @@
 size_t Heap::objectCount() 
 {
-    return primaryHeap.numLiveObjects + numberHeap.numLiveObjects; 
+    return primaryHeap.numLiveObjects + numberHeap.numLiveObjects - m_globalData->smallStrings.count(); 
 }
 

trunk/JavaScriptCore/runtime/SmallStrings.cpp

@@ -100 +100 @@
     }
 }
-    
+
+unsigned SmallStrings::count() const
+{
+    unsigned count = 0;
+    if (m_emptyString)
+        ++count;
+    for (unsigned i = 0; i < numCharactersToStore; ++i) {
+        if (m_singleCharacterStrings[i])
+            ++count;
+    }
+    return count;
+}
+
 void SmallStrings::createEmptyString(JSGlobalData* globalData)
 {

trunk/JavaScriptCore/runtime/SmallStrings.h

@@ -59 +59 @@
         void mark();
 
+        unsigned count() const;
+
     private:
         void createEmptyString(JSGlobalData*);