Changeset 34907 in webkit

Timestamp:

Jul 1, 2008 12:01:51 AM (16 years ago)

Author:

ggaren@apple.com

Message:

2008-06-30 Geoffrey Garen <​ggaren@apple.com>

Reviewed by Oliver Hunt.

Fixed a global object leak caused by the switch to one register file.

Don't unconditionally mark the register file, since that logically
makes all global variables GC roots, even when their global object is
no longer reachable.

Instead, make the global object associated with the register file
responsible for marking the register file.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/Machine.h (modified) (1 diff)
• kjs/JSGlobalData.cpp (modified) (1 diff)
• kjs/JSGlobalObject.cpp (modified) (1 diff)
• kjs/collector.cpp (modified) (2 diffs)
• kjs/collector.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-06-30  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Oliver Hunt.
+        
+        Fixed a global object leak caused by the switch to one register file.
+        
+        Don't unconditionally mark the register file, since that logically
+        makes all global variables GC roots, even when their global object is
+        no longer reachable.
+        
+        Instead, make the global object associated with the register file
+        responsible for marking the register file.
+
 2008-06-30  Geoffrey Garen  <ggaren@apple.com>
 

trunk/JavaScriptCore/VM/Machine.h

@@ -118 +118 @@
             m_timeoutCheckCount = 0;
         }
-        void mark(Heap* heap) { m_registerFile.mark(heap); }
 
     private:

trunk/JavaScriptCore/kjs/JSGlobalData.cpp

@@ -59 +59 @@
 JSGlobalData::JSGlobalData()
     : machine(new Machine)
-    , heap(new Heap(machine))
+    , heap(new Heap)
 #if USE(MULTIPLE_THREADS)
     , arrayTable(new HashTable(KJS::arrayTable))

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -347 +347 @@
         (*it)->mark();
 
+    RegisterFile& registerFile = globalData()->machine->registerFile();
+    if (registerFile.globalObject() == this)
+        registerFile.mark(globalData()->heap);
+
     markIfNeeded(d()->globalExec->exception());
 

trunk/JavaScriptCore/kjs/collector.cpp

@@ -91 +91 @@
 static void freeHeap(CollectorHeap*);
 
-Heap::Heap(Machine* machine)
+Heap::Heap()
     : m_markListSet(0)
-    , m_machine(machine)
 {
     memset(&primaryHeap, 0, sizeof(CollectorHeap));
@@ -909 +908 @@
     markStackObjectsConservatively();
     markProtectedObjects();
-    m_machine->mark(this);
     if (m_markListSet && m_markListSet->size())
         ArgList::markLists(*m_markListSet);

trunk/JavaScriptCore/kjs/collector.h

@@ -108 +108 @@
         friend class Machine;
         friend class JSGlobalData;
-        Heap(Machine*);
+        Heap();
         ~Heap();
 
@@ -124 +124 @@
         ProtectCountSet protectedValues;
         HashSet<ArgList*>* m_markListSet;
-        Machine* m_machine;
     };