Changeset 76078 in webkit

Timestamp:

Jan 18, 2011, 3:45:34 PM (15 years ago)

Author:

[email protected]

Message:

2011-01-18 Geoffrey Garen <​[email protected]>

Reviewed by Darin Adler.

Removed RegisterFile::markGlobals because it was obtuse, and it
unnecessarily relied on conservative marking.
​https://bugs.webkit.org/show_bug.cgi?id=52668

• interpreter/RegisterFile.h: Removed markGlobals.

• runtime/JSActivation.cpp: (JSC::JSActivation::markChildren): Added a comment explaning why some JSActivations don't always mark their registers arrays.

• runtime/JSGlobalObject.cpp: (JSC::JSGlobalObject::markChildren): Instead of calling markGlobals, mark the registers array directly.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/RegisterFile.h (modified) (1 diff)
• runtime/JSActivation.cpp (modified) (1 diff)
• runtime/JSGlobalObject.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-01-18  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Darin Adler.
+
+        Removed RegisterFile::markGlobals because it was obtuse, and it
+        unnecessarily relied on conservative marking.
+        https://bugs.webkit.org/show_bug.cgi?id=52668
+
+        * interpreter/RegisterFile.h: Removed markGlobals.
+
+        * runtime/JSActivation.cpp:
+        (JSC::JSActivation::markChildren): Added a comment explaning why some
+        JSActivations don't always mark their registers arrays.
+
+        * runtime/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::markChildren): Instead of calling markGlobals, mark
+        the registers array directly.
+
 2011-01-18  Michael Saboff  <[email protected]>
 

trunk/Source/JavaScriptCore/interpreter/RegisterFile.h

@@ -132 +132 @@
         Register* lastGlobal() const { return m_start - m_numGlobals; }
         
-        void markGlobals(MarkStack& markStack, Heap* heap) { heap->markConservatively(markStack, lastGlobal(), m_start); }
         void markCallFrames(MarkStack& markStack, Heap* heap) { heap->markConservatively(markStack, m_start, m_end); }
 

trunk/Source/JavaScriptCore/runtime/JSActivation.cpp

@@ -54 +54 @@
     Base::markChildren(markStack);
 
+    // No need to mark our registers if they're still in the RegisterFile.
     Register* registerArray = d()->registerArray.get();
     if (!registerArray)

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -350 +350 @@
         (*it)->markAggregate(markStack);
 
-    RegisterFile& registerFile = globalData().interpreter->registerFile();
-    if (registerFile.globalObject() == this)
-        registerFile.markGlobals(markStack, &globalData().heap);
-
     markIfNeeded(markStack, d()->regExpConstructor);
     markIfNeeded(markStack, d()->errorConstructor);
@@ -398 +394 @@
     // guaranteed to be referenced elsewhere.
 
-    Register* registerArray = d()->registerArray.get();
-    if (!registerArray)
-        return;
-
-    size_t size = d()->registerArraySize;
-    markStack.appendValues(reinterpret_cast<JSValue*>(registerArray), size);
+    markStack.appendValues(d()->registers - symbolTable().size(), symbolTable().size());
 }