JavaScriptCore-7600.1.4.15.12.tar.gz

[apple/javascriptcore.git] / runtime / IndexingHeader.h

diff --git a/runtime/IndexingHeader.h b/runtime/IndexingHeader.h
index cee0762df8a0e5524a42dc9cb7190b632b9504c4..aadd8299fa18d486773d7e4e2982841c367a116b 100644 (file)
--- a/runtime/IndexingHeader.h
+++ b/runtime/IndexingHeader.h
@@ -27,10 +27,10 @@
 #define IndexingHeader_h
 
 #include "PropertyStorage.h"
 #define IndexingHeader_h
 
 #include "PropertyStorage.h"

-#include <wtf/Platform.h>

 
 namespace JSC {
 
 
 namespace JSC {
 

+class ArrayBuffer;

 class Butterfly;
 class LLIntOffsetsExtractor;
 class Structure;
 class Butterfly;
 class LLIntOffsetsExtractor;
 class Structure;


@@ -44,25 +44,29 @@ public:
     
     static ptrdiff_t offsetOfIndexingHeader() { return -static_cast<ptrdiff_t>(sizeof(IndexingHeader)); }
     
     
     static ptrdiff_t offsetOfIndexingHeader() { return -static_cast<ptrdiff_t>(sizeof(IndexingHeader)); }
     

-    static ptrdiff_t offsetOfPublicLength() { return OBJECT_OFFSETOF(IndexingHeader, m_publicLength); }
-    static ptrdiff_t offsetOfVectorLength() { return OBJECT_OFFSETOF(IndexingHeader, m_vectorLength); }
+    static ptrdiff_t offsetOfArrayBuffer() { return OBJECT_OFFSETOF(IndexingHeader, u.typedArray.buffer); }
+    static ptrdiff_t offsetOfPublicLength() { return OBJECT_OFFSETOF(IndexingHeader, u.lengths.publicLength); }
+    static ptrdiff_t offsetOfVectorLength() { return OBJECT_OFFSETOF(IndexingHeader, u.lengths.vectorLength); }

     
     IndexingHeader()
     
     IndexingHeader()

-        : m_publicLength(0)
-        , m_vectorLength(0)

     {
     {

+        u.lengths.publicLength = 0;
+        u.lengths.vectorLength = 0;

     }
     
     }
     

-    uint32_t vectorLength() const { return m_vectorLength; }
+    uint32_t vectorLength() const { return u.lengths.vectorLength; }

     
     void setVectorLength(uint32_t length)
     {
         RELEASE_ASSERT(length <= maximumLength);
     
     void setVectorLength(uint32_t length)
     {
         RELEASE_ASSERT(length <= maximumLength);

-        m_vectorLength = length;
+        u.lengths.vectorLength = length;

     }
     
     }
     

-    uint32_t publicLength() { return m_publicLength; }
-    void setPublicLength(uint32_t auxWord) { m_publicLength = auxWord; }
+    uint32_t publicLength() const { return u.lengths.publicLength; }
+    void setPublicLength(uint32_t auxWord) { u.lengths.publicLength = auxWord; }
+    
+    ArrayBuffer* arrayBuffer() { return u.typedArray.buffer; }
+    void setArrayBuffer(ArrayBuffer* buffer) { u.typedArray.buffer = buffer; }

     
     static IndexingHeader* from(Butterfly* butterfly)
     {
     
     static IndexingHeader* from(Butterfly* butterfly)
     {


@@ -76,7 +80,12 @@ public:
     
     static IndexingHeader* from(ArrayStorage* arrayStorage)
     {
     
     static IndexingHeader* from(ArrayStorage* arrayStorage)
     {

-        return reinterpret_cast<IndexingHeader*>(arrayStorage) - 1;
+        return const_cast<IndexingHeader*>(from(const_cast<const ArrayStorage*>(arrayStorage)));
+    }
+    
+    static const IndexingHeader* from(const ArrayStorage* arrayStorage)
+    {
+        return reinterpret_cast<const IndexingHeader*>(arrayStorage) - 1;

     }
     
     static IndexingHeader* fromEndOf(PropertyStorage propertyStorage)
     }
     
     static IndexingHeader* fromEndOf(PropertyStorage propertyStorage)


@@ -111,9 +120,17 @@ public:
     
 private:
     friend class LLIntOffsetsExtractor;
     
 private:
     friend class LLIntOffsetsExtractor;

-    
-    uint32_t m_publicLength; // The meaning of this field depends on the array type, but for all JSArrays we rely on this being the publicly visible length (array.length).
-    uint32_t m_vectorLength; // The length of the indexed property storage. The actual size of the storage depends on this, and the type.
+
+    union {
+        struct {
+            uint32_t publicLength; // The meaning of this field depends on the array type, but for all JSArrays we rely on this being the publicly visible length (array.length).
+            uint32_t vectorLength; // The length of the indexed property storage. The actual size of the storage depends on this, and the type.
+        } lengths;
+        
+        struct {
+            ArrayBuffer* buffer;
+        } typedArray;
+    } u;

 };
 
 } // namespace JSC
 };
 
 } // namespace JSC