Changeset 140195 in webkit for trunk/Source/JavaScriptCore/heap/MarkStack.h

Timestamp:

Jan 18, 2013, 12:49:58 PM (12 years ago)

Author:

[email protected]

Message:

r134080 causes heap problem on linux systems where PAGESIZE != 4096
​https://bugs.webkit.org/show_bug.cgi?id=102828

Patch by Balazs Kilvady <​[email protected]> on 2013-01-18
Reviewed by Mark Hahnenberg.

Make MarkStackSegment::blockSize as the capacity of segments of a MarkStackArray.

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreExports.def:
• heap/MarkStack.cpp:

(JSC):
(JSC::MarkStackArray::MarkStackArray):
(JSC::MarkStackArray::expand):
(JSC::MarkStackArray::donateSomeCellsTo):
(JSC::MarkStackArray::stealSomeCellsFrom):

• heap/MarkStack.h:

(JSC::MarkStackSegment::data):
(CapacityFromSize):
(MarkStackArray):

• heap/MarkStackInlines.h:

(JSC::MarkStackArray::setTopForFullSegment):
(JSC::MarkStackArray::append):
(JSC::MarkStackArray::isEmpty):
(JSC::MarkStackArray::size):

• runtime/Options.h:

(JSC):

File:

• trunk/Source/JavaScriptCore/heap/MarkStack.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/heap/MarkStack.h

@@ -76 +76 @@
         return bitwise_cast<const JSCell**>(this + 1);
     }
-    
-    static size_t capacityFromSize(size_t size)
-    {
-        return (size - sizeof(MarkStackSegment)) / sizeof(const JSCell*);
-    }
-    
-    static size_t sizeFromCapacity(size_t capacity)
-    {
-        return sizeof(MarkStackSegment) + capacity * sizeof(const JSCell*);
-    }
 
     static const size_t blockSize = 4 * KB;
@@ -112 +102 @@
 
 private:
+    template <size_t size> struct CapacityFromSize {
+        static const size_t value = (size - sizeof(MarkStackSegment)) / sizeof(const JSCell*);
+    };
+
     JS_EXPORT_PRIVATE void expand();
     
@@ -125 +119 @@
     BlockAllocator& m_blockAllocator;
 
-    size_t m_segmentCapacity;
+    JS_EXPORT_PRIVATE static const size_t s_segmentCapacity = CapacityFromSize<MarkStackSegment::blockSize>::value;
     size_t m_top;
     size_t m_numberOfSegments;