JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / runtime / StructureChain.cpp

diff --git a/runtime/StructureChain.cpp b/runtime/StructureChain.cpp
index e83f626ab1b134be7e397dcf73092d03ce573273..89a0ec0c2067b4696fa31e269b597d7c6b99baff 100644 (file)
--- a/runtime/StructureChain.cpp
+++ b/runtime/StructureChain.cpp
@@ -31,31 +31,35 @@
 #include <wtf/RefPtr.h>
 
 namespace JSC {
 #include <wtf/RefPtr.h>
 
 namespace JSC {

+    
+ClassInfo StructureChain::s_info = { "StructureChain", 0, 0, 0 };

 
 

-StructureChain::StructureChain(Structure* head)
+StructureChain::StructureChain(JSGlobalData& globalData, Structure* structure, Structure* head)
+    : JSCell(globalData, structure)

 {
     size_t size = 0;
     for (Structure* current = head; current; current = current->storedPrototype().isNull() ? 0 : asObject(current->storedPrototype())->structure())
         ++size;
     
 {
     size_t size = 0;
     for (Structure* current = head; current; current = current->storedPrototype().isNull() ? 0 : asObject(current->storedPrototype())->structure())
         ++size;
     

-    m_vector.set(new RefPtr<Structure>[size + 1]);
+    m_vector = adoptArrayPtr(new WriteBarrier<Structure>[size + 1]);

 
     size_t i = 0;
     for (Structure* current = head; current; current = current->storedPrototype().isNull() ? 0 : asObject(current->storedPrototype())->structure())
 
     size_t i = 0;
     for (Structure* current = head; current; current = current->storedPrototype().isNull() ? 0 : asObject(current->storedPrototype())->structure())

-        m_vector[i++] = current;
-    m_vector[i] = 0;
+        m_vector[i++].set(globalData, this, current);
+    m_vector[i].clear();

 }
 
 }
 

-bool StructureChain::isCacheable() const
+StructureChain::~StructureChain()

 {
 {

-    uint32_t i = 0;
-    
-    while (m_vector[i]) {
-        // Both classes of dictionary structure may change arbitrarily so we can't cache them
-        if (m_vector[i++]->isDictionary())
-            return false;
-    }
-    return true;
+}
+
+void StructureChain::visitChildren(SlotVisitor& visitor)
+{
+    ASSERT_GC_OBJECT_INHERITS(this, &s_info);
+    ASSERT(structure()->typeInfo().overridesVisitChildren());
+    size_t i = 0;
+    while (m_vector[i])
+        visitor.append(&m_vector[i++]);

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