Changeset 62367 in webkit for trunk/JavaScriptCore/runtime/Collector.h

Timestamp:

Jul 1, 2010, 11:31:27 PM (15 years ago)

Author:

[email protected]

Message:

2010-07-01 Oliver Hunt <​[email protected]>

Reviewed by Maciej Stachowiak.

Add a FixedArray template to encapsulate fixed length arrays
​https://bugs.webkit.org/show_bug.cgi?id=41506

This new type is used in place of fixed length C arrays so
that debug builds can guard against attempts to go beyond
the end of the array.

• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/Opcode.cpp: (JSC::OpcodeStats::~OpcodeStats):
• pcre/pcre_compile.cpp: (calculateCompiledPatternLength):
• runtime/Collector.cpp: (JSC::Heap::allocateBlock): (JSC::Heap::allocate):
• runtime/Collector.h: (JSC::CollectorBitmap::clearAll):
• runtime/CollectorHeapIterator.h: (JSC::CollectorHeapIterator::operator*):
• runtime/DateInstanceCache.h:
• runtime/JSString.cpp: (JSC::JSString::replaceCharacter):
• runtime/JSString.h: (JSC::RopeBuilder::JSStringFinalizerStruct::):
• runtime/NumericStrings.h:
• runtime/RegExpCache.h:
• runtime/SmallStrings.h: (JSC::SmallStrings::singleCharacterStrings):
• wtf/AVLTree.h:
• wtf/FixedArray.h: Added. (WTF::FixedArray::operator[]): (WTF::FixedArray::data):

2010-07-01 Oliver Hunt <​[email protected]>

Reviewed by Maciej Stachowiak.

Add a FixedArray template to encapsulate fixed length arrays
​https://bugs.webkit.org/show_bug.cgi?id=41506

Add forwarding header.

• ForwardingHeaders/wtf/FixedArray.h: Added.

2010-07-01 Oliver Hunt <​[email protected]>

Reviewed by Maciej Stachowiak.

Add a FixedArray template to encapsulate fixed length arrays
​https://bugs.webkit.org/show_bug.cgi?id=41506

Add forwarding header, and replace a few fixed length arrays
with the new FixedArray type.

• ForwardingHeaders/wtf/FixedArray.h: Added.
• dom/Document.h:
• platform/graphics/GlyphMetricsMap.h:

File:

• trunk/JavaScriptCore/runtime/Collector.h (modified) (3 diffs)

trunk/JavaScriptCore/runtime/Collector.h

@@ -25 +25 @@
 #include <stddef.h>
 #include <string.h>
+#include <wtf/FixedArray.h>
 #include <wtf/HashCountedSet.h>
 #include <wtf/HashSet.h>
@@ -216 +217 @@
 
     struct CollectorBitmap {
-        uint32_t bits[BITMAP_WORDS];
+        FixedArray<uint32_t, BITMAP_WORDS> bits;
         bool get(size_t n) const { return !!(bits[n >> 5] & (1 << (n & 0x1F))); } 
         void set(size_t n) { bits[n >> 5] |= (1 << (n & 0x1F)); } 
         void clear(size_t n) { bits[n >> 5] &= ~(1 << (n & 0x1F)); } 
-        void clearAll() { memset(bits, 0, sizeof(bits)); }
+        void clearAll() { memset(bits.data(), 0, sizeof(bits)); }
         ALWAYS_INLINE void advanceToNextPossibleFreeCell(size_t& startCell)
         {
@@ -249 +250 @@
   
     struct CollectorCell {
-        double memory[CELL_ARRAY_LENGTH];
+        FixedArray<double, CELL_ARRAY_LENGTH> memory;
     };
 
     class CollectorBlock {
     public:
-        CollectorCell cells[CELLS_PER_BLOCK];
+        FixedArray<CollectorCell, CELLS_PER_BLOCK> cells;
         CollectorBitmap marked;
         Heap* heap;