Changeset 76399 in webkit

Timestamp:

Jan 21, 2011 3:24:07 PM (13 years ago)

Author:

ggaren@apple.com

Message:

2011-01-21 Geoffrey Garen <​ggaren@apple.com>

Reviewed by Sam Weinig.

Moved the mark stack from global data to the heap, since it pertains
to the heap, and not the virtual machine as a whole.
​https://bugs.webkit.org/show_bug.cgi?id=52930

SunSpider reports no change.

• runtime/Heap.cpp: (JSC::Heap::Heap): (JSC::Heap::markRoots):
• runtime/Heap.h:
• runtime/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData):
• runtime/JSGlobalData.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Heap.cpp (modified) (2 diffs)
• runtime/Heap.h (modified) (2 diffs)
• runtime/JSGlobalData.cpp (modified) (1 diff)
• runtime/JSGlobalData.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-01-21  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Moved the mark stack from global data to the heap, since it pertains
+        to the heap, and not the virtual machine as a whole.
+        https://bugs.webkit.org/show_bug.cgi?id=52930
+        
+        SunSpider reports no change.
+
+        * runtime/Heap.cpp:
+        (JSC::Heap::Heap):
+        (JSC::Heap::markRoots):
+        * runtime/Heap.h:
+        * runtime/JSGlobalData.cpp:
+        (JSC::JSGlobalData::JSGlobalData):
+        * runtime/JSGlobalData.h:
+
 2011-01-21  Peter Gal  <galpeter@inf.u-szeged.hu>
 

trunk/Source/JavaScriptCore/runtime/Heap.cpp

@@ -42 +42 @@
     , m_activityCallback(DefaultGCActivityCallback::create(this))
     , m_globalData(globalData)
-    , m_machineStackMarker(&globalData->heap)
+    , m_machineStackMarker(this)
+    , m_markStack(globalData->jsArrayVPtr)
     , m_extraCost(0)
 {
@@ -263 +264 @@
     m_markedSpace.clearMarkBits();
 
-    MarkStack& markStack = m_globalData->markStack;
+    MarkStack& markStack = m_markStack;
     conservativeSet.mark(markStack);
     markStack.drain();

trunk/Source/JavaScriptCore/runtime/Heap.h

@@ -23 +23 @@
 #define Heap_h
 
+#include "MarkStack.h"
 #include "MarkedSpace.h"
 #include <wtf/Forward.h>
@@ -132 +133 @@
         
         MachineStackMarker m_machineStackMarker;
+        MarkStack m_markStack;
         
         size_t m_extraCost;

trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -144 +144 @@
     , dynamicGlobalObject(0)
     , firstStringifierToMark(0)
-    , markStack(jsArrayVPtr)
     , cachedUTCOffset(NaN)
     , maxReentryDepth(threadStackType == ThreadStackTypeSmall ? MaxSmallThreadReentryDepth : MaxLargeThreadReentryDepth)

trunk/Source/JavaScriptCore/runtime/JSGlobalData.h

@@ -36 +36 @@
 #include "JITStubs.h"
 #include "JSValue.h"
-#include "MarkStack.h"
 #include "NumericStrings.h"
 #include "SmallStrings.h"
@@ -219 +218 @@
         Stringifier* firstStringifierToMark;
 
-        MarkStack markStack;
-
         double cachedUTCOffset;
         DSTOffsetCache dstOffsetCache;