Changeset 93835 in webkit for trunk/Source/JavaScriptCore/runtime/StructureChain.h

Timestamp:

Aug 25, 2011, 4:30:14 PM (14 years ago)

Author:

[email protected]

Message:

Unzip initialization lists and constructors in JSCell hierarchy (1/7)
​https://bugs.webkit.org/show_bug.cgi?id=66827

Patch by Mark Hahnenberg <​[email protected]> on 2011-08-25
Reviewed by Geoffrey Garen.

Added finishCreation() methods to all immediately subclasses of JSCell with
non-empty constructors. Part of a larger refactoring to "unzip" initialization
lists and constructor bodies. Also renamed JSCell's constructorBody() method
to finishCreation().

• runtime/Executable.h:

(JSC::ExecutableBase::ExecutableBase):
(JSC::ExecutableBase::constructorBody):

• runtime/GetterSetter.h:

(JSC::GetterSetter::GetterSetter):

• runtime/JSAPIValueWrapper.h:

(JSC::JSAPIValueWrapper::constructorBody):
(JSC::JSAPIValueWrapper::JSAPIValueWrapper):

• runtime/JSCell.h:

(JSC::JSCell::JSCell::JSCell):
(JSC::JSCell::JSCell::constructorBody):

• runtime/JSObject.h:

(JSC::JSObject::constructorBody):
(JSC::JSObject::JSObject):

• runtime/JSPropertyNameIterator.h:

(JSC::JSPropertyNameIterator::constructorBody):

• runtime/JSString.h:

(JSC::RopeBuilder::JSString):
(JSC::RopeBuilder::constructorBody):

• runtime/RegExp.cpp:

(JSC::RegExp::RegExp):
(JSC::RegExp::constructorBody):

• runtime/RegExp.h:
• runtime/ScopeChain.h:

(JSC::ScopeChainNode::ScopeChainNode):
(JSC::ScopeChainNode::constructorBody):

• runtime/Structure.cpp:

(JSC::Structure::Structure):

• runtime/StructureChain.cpp:

(JSC::StructureChain::StructureChain):

• runtime/StructureChain.h:

(JSC::StructureChain::create):
(JSC::StructureChain::constructorBody):

File:

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

trunk/Source/JavaScriptCore/runtime/StructureChain.h

@@ -28 +28 @@
 
 #include "JSCell.h"
+#include "JSObject.h"
 #include "Structure.h"
 
@@ -45 +46 @@
         typedef JSCell Base;
 
-        static StructureChain* create(JSGlobalData& globalData, Structure* head) { return new (allocateCell<StructureChain>(globalData.heap)) StructureChain(globalData, globalData.structureChainStructure.get(), head); }
+        static StructureChain* create(JSGlobalData& globalData, Structure* head)
+        { 
+            return new (allocateCell<StructureChain>(globalData.heap)) StructureChain(globalData, globalData.structureChainStructure.get(), head); 
+        }
         WriteBarrier<Structure>* head() { return m_vector.get(); }
         void visitChildren(SlotVisitor&);
@@ -52 +56 @@
         
         static ClassInfo s_info;
+
+    protected:
+        void finishCreation(JSGlobalData& globalData, Structure* head)
+        {
+            Base::finishCreation(globalData);
+            size_t size = 0;
+            for (Structure* current = head; current; current = current->storedPrototype().isNull() ? 0 : asObject(current->storedPrototype())->structure())
+                ++size;
+    
+            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())
+                m_vector[i++].set(globalData, this, current);
+        }
 
     private: