Changeset 93920 in webkit for trunk/Source/JavaScriptCore/runtime/Executable.h

Timestamp:

Aug 26, 2011, 3:32:53 PM (14 years ago)

Author:

[email protected]

Message:

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

Patch by Mark Hahnenberg <​[email protected]> on 2011-08-26
Reviewed by Darin Adler.

Completed the second level of the refactoring to add finishCreation()
methods to all classes within the JSCell hierarchy with non-trivial
constructor bodies.

• runtime/Executable.h:

(JSC::ExecutableBase::ExecutableBase):
(JSC::ExecutableBase::create):
(JSC::NativeExecutable::create):
(JSC::NativeExecutable::finishCreation):
(JSC::NativeExecutable::NativeExecutable):
(JSC::ScriptExecutable::ScriptExecutable):
(JSC::ScriptExecutable::finishCreation):

• runtime/GetterSetter.h:

(JSC::GetterSetter::GetterSetter):
(JSC::GetterSetter::create):

• runtime/JSAPIValueWrapper.h:

(JSC::JSAPIValueWrapper::create):
(JSC::JSAPIValueWrapper::JSAPIValueWrapper):

• runtime/JSObject.h:

(JSC::JSNonFinalObject::JSNonFinalObject):
(JSC::JSNonFinalObject::finishCreation):
(JSC::JSFinalObject::create):
(JSC::JSFinalObject::finishCreation):
(JSC::JSFinalObject::JSFinalObject):
(JSC::JSObject::JSObject):

• runtime/JSPropertyNameIterator.cpp:

(JSC::JSPropertyNameIterator::JSPropertyNameIterator):
(JSC::JSPropertyNameIterator::create):

• runtime/JSPropertyNameIterator.h:

(JSC::JSPropertyNameIterator::create):

• runtime/RegExp.cpp:

(JSC::RegExp::RegExp):
(JSC::RegExp::createWithoutCaching):

• runtime/ScopeChain.h:

(JSC::ScopeChainNode::ScopeChainNode):
(JSC::ScopeChainNode::create):

• runtime/Structure.cpp:

(JSC::Structure::Structure):

• runtime/Structure.h:

(JSC::Structure::create):
(JSC::Structure::finishCreation):
(JSC::Structure::createStructure):

• runtime/StructureChain.cpp:

(JSC::StructureChain::StructureChain):

• runtime/StructureChain.h:

(JSC::StructureChain::create):

File:

• trunk/Source/JavaScriptCore/runtime/Executable.h (modified) (9 diffs)

trunk/Source/JavaScriptCore/runtime/Executable.h

@@ -59 +59 @@
             , m_numParametersForConstruct(numParameters)
         {
-            finishCreation(globalData);
         }
 
@@ -76 +75 @@
         static ExecutableBase* create(JSGlobalData& globalData, Structure* structure, int numParameters)
         {
-            return new (allocateCell<ExecutableBase>(globalData.heap)) ExecutableBase(globalData, structure, numParameters);
+            ExecutableBase* executable = new (allocateCell<ExecutableBase>(globalData.heap)) ExecutableBase(globalData, structure, numParameters);
+            executable->finishCreation(globalData);
+            return executable;
         }
 
@@ -181 +182 @@
         static NativeExecutable* create(JSGlobalData& globalData, MacroAssemblerCodePtr callThunk, NativeFunction function, MacroAssemblerCodePtr constructThunk, NativeFunction constructor)
         {
+            NativeExecutable* executable;
             if (!callThunk)
-                return new (allocateCell<NativeExecutable>(globalData.heap)) NativeExecutable(globalData, JITCode(), function, JITCode(), constructor);
-            return new (allocateCell<NativeExecutable>(globalData.heap)) NativeExecutable(globalData, JITCode::HostFunction(callThunk), function, JITCode::HostFunction(constructThunk), constructor);
+                executable = new (allocateCell<NativeExecutable>(globalData.heap)) NativeExecutable(globalData, JITCode(), function, JITCode(), constructor);
+            else
+                executable = new (allocateCell<NativeExecutable>(globalData.heap)) NativeExecutable(globalData, JITCode::HostFunction(callThunk), function, JITCode::HostFunction(constructThunk), constructor);
+            return executable;
         }
 #else
@@ -199 +203 @@
         
         static const ClassInfo s_info;
-    
+
+    protected:
+#if ENABLE(JIT)
+        void finishCreation(JSGlobalData& globalData, JITCode callThunk, JITCode constructThunk)
+        {
+            Base::finishCreation(globalData);
+            m_jitCodeForCall = callThunk;
+            m_jitCodeForConstruct = constructThunk;
+            m_jitCodeForCallWithArityCheck = callThunk.addressForCall();
+            m_jitCodeForConstructWithArityCheck = constructThunk.addressForCall();
+        }
+#endif
+ 
     private:
 #if ENABLE(JIT)
@@ -207 +223 @@
             , m_constructor(constructor)
         {
-            m_jitCodeForCall = callThunk;
-            m_jitCodeForConstruct = constructThunk;
-            m_jitCodeForCallWithArityCheck = callThunk.addressForCall();
-            m_jitCodeForConstructWithArityCheck = constructThunk.addressForCall();
+            finishCreation(globalData, callThunk, constructThunk);
         }
 #else
@@ -218 +231 @@
             , m_constructor(constructor)
         {
+            finishCreation(globalData);
         }
 #endif
@@ -236 +250 @@
             , m_features(isInStrictContext ? StrictModeFeature : 0)
         {
-#if ENABLE(CODEBLOCK_SAMPLING)
-            if (SamplingTool* sampler = globalData.interpreter->sampler())
-                sampler->notifyOfScope(globalData, this);
-#else
-            UNUSED_PARAM(globalData);
-#endif
+            finishCreation(globalData);
         }
 
@@ -249 +258 @@
             , m_features(isInStrictContext ? StrictModeFeature : 0)
         {
-#if ENABLE(CODEBLOCK_SAMPLING)
-            if (SamplingTool* sampler = exec->globalData().interpreter->sampler())
-                sampler->notifyOfScope(exec->globalData(), this);
-#else
-            UNUSED_PARAM(exec);
-#endif
+            finishCreation(exec->globalData());
         }
 
@@ -271 +275 @@
         
         static const ClassInfo s_info;
+
     protected:
+        void finishCreation(JSGlobalData& globalData)
+        {
+            Base::finishCreation(globalData);
+#if ENABLE(CODEBLOCK_SAMPLING)
+            if (SamplingTool* sampler = globalData.interpreter->sampler())
+                sampler->notifyOfScope(globalData, this);
+#endif
+        }
+
         void recordParse(CodeFeatures features, bool hasCapturedVariables, int firstLine, int lastLine)
         {