Changeset 93378 in webkit for trunk/Source/JavaScriptCore/runtime/JSString.h

Timestamp:

Aug 18, 2011, 5:58:34 PM (14 years ago)

Author:

[email protected]

Message:

Move allocation in constructors into separate constructorBody() methods
​https://bugs.webkit.org/show_bug.cgi?id=66265

Patch by Mark Hahnenberg <​[email protected]> on 2011-08-18
Reviewed by Oliver Hunt.

Source/JavaScriptCore:

Refactoring to put all allocations that need to be done after the object's
initialization list has executed but before the object is ready for use
into a separate constructorBody() method. This method is still called by the constructor,
so the patch doesn't resolve any potential issues, it's just to set up the code for further refactoring.

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• jsc.cpp:

(GlobalObject::constructorBody):
(GlobalObject::GlobalObject):

• runtime/ErrorInstance.cpp:

(JSC::ErrorInstance::ErrorInstance):

• runtime/ErrorInstance.h:

(JSC::ErrorInstance::constructorBody):

• runtime/ErrorPrototype.cpp:

(JSC::ErrorPrototype::ErrorPrototype):
(JSC::ErrorPrototype::constructorBody):

• runtime/ErrorPrototype.h:
• runtime/Executable.cpp:

(JSC::FunctionExecutable::FunctionExecutable):

• runtime/Executable.h:

(JSC::FunctionExecutable::constructorBody):

• runtime/InternalFunction.cpp:

(JSC::InternalFunction::InternalFunction):

• runtime/InternalFunction.h:

(JSC::InternalFunction::constructorBody):

• runtime/JSByteArray.cpp:

(JSC::JSByteArray::JSByteArray):

• runtime/JSByteArray.h:

(JSC::JSByteArray::constructorBody):

• runtime/JSFunction.cpp:

(JSC::JSFunction::JSFunction):
(JSC::JSFunction::constructorBody):

• runtime/JSFunction.h:
• runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::JSGlobalObject):
(JSC::JSGlobalObject::constructorBody):

• runtime/JSPropertyNameIterator.cpp:

(JSC::JSPropertyNameIterator::JSPropertyNameIterator):

• runtime/JSPropertyNameIterator.h:

(JSC::JSPropertyNameIterator::constructorBody):

• runtime/JSString.h:

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

• runtime/NativeErrorConstructor.cpp:

(JSC::NativeErrorConstructor::NativeErrorConstructor):

• runtime/NativeErrorConstructor.h:

(JSC::NativeErrorConstructor::constructorBody):

• runtime/NativeErrorPrototype.cpp:

(JSC::NativeErrorPrototype::NativeErrorPrototype):
(JSC::NativeErrorPrototype::constructorBody):

• runtime/NativeErrorPrototype.h:
• runtime/StringObject.cpp:
• runtime/StringObject.h:

(JSC::StringObject::create):

• runtime/StringObjectThatMasqueradesAsUndefined.h:

(JSC::StringObjectThatMasqueradesAsUndefined::create):
(JSC::StringObjectThatMasqueradesAsUndefined::StringObjectThatMasqueradesAsUndefined):

• runtime/StringPrototype.cpp:

(JSC::StringPrototype::StringPrototype):

• runtime/StringPrototype.h:

(JSC::StringPrototype::create):

Source/WebCore:

No new tests.

Refactoring to put all allocations that need to be done after the object's
initialization list has executed but before the object is ready for use
into a separate constructorBody() method. This method is still called by the constructor,
so the patch doesn't resolve any potential issues, it's just to set up the code for further refactoring.

• bridge/objc/ObjCRuntimeObject.h:

(JSC::Bindings::ObjCRuntimeObject::create):

• bridge/objc/ObjCRuntimeObject.mm:
• bridge/objc/objc_instance.mm:

(ObjCRuntimeMethod::create):
(ObjCRuntimeMethod::ObjCRuntimeMethod):

• bridge/runtime_array.cpp:
• bridge/runtime_array.h:

(JSC::RuntimeArray::create):

File:

• trunk/Source/JavaScriptCore/runtime/JSString.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -268 +268 @@
             , m_fiberCount(s_maxInternalRopeLength)
         {
+            constructorBody(exec, v1, v2, v3);
+        }
+
+        // This constructor constructs a new string by concatenating u1 & u2.
+        JSString(JSGlobalData& globalData, const UString& u1, const UString& u2)
+            : JSCell(globalData, globalData.stringStructure.get())
+            , m_length(u1.length() + u2.length())
+            , m_fiberCount(2)
+        {
+            unsigned index = 0;
+            appendStringInConstruct(index, u1);
+            appendStringInConstruct(index, u2);
+            ASSERT(index <= s_maxInternalRopeLength);
+        }
+
+        // This constructor constructs a new string by concatenating u1, u2 & u3.
+        JSString(JSGlobalData& globalData, const UString& u1, const UString& u2, const UString& u3)
+            : JSCell(globalData, globalData.stringStructure.get())
+            , m_length(u1.length() + u2.length() + u3.length())
+            , m_fiberCount(s_maxInternalRopeLength)
+        {
+            unsigned index = 0;
+            appendStringInConstruct(index, u1);
+            appendStringInConstruct(index, u2);
+            appendStringInConstruct(index, u3);
+            ASSERT(index <= s_maxInternalRopeLength);
+        }
+
+    protected:
+        void constructorBody(ExecState* exec, JSValue v1, JSValue v2, JSValue v3)
+        {
             unsigned index = 0;
             appendValueInConstructAndIncrementLength(exec, index, v1);
@@ -273 +304 @@
             appendValueInConstructAndIncrementLength(exec, index, v3);
             ASSERT(index == s_maxInternalRopeLength);
-        }
-
-        // This constructor constructs a new string by concatenating u1 & u2.
-        JSString(JSGlobalData& globalData, const UString& u1, const UString& u2)
-            : JSCell(globalData, globalData.stringStructure.get())
-            , m_length(u1.length() + u2.length())
-            , m_fiberCount(2)
-        {
-            unsigned index = 0;
-            appendStringInConstruct(index, u1);
-            appendStringInConstruct(index, u2);
-            ASSERT(index <= s_maxInternalRopeLength);
-        }
-
-        // This constructor constructs a new string by concatenating u1, u2 & u3.
-        JSString(JSGlobalData& globalData, const UString& u1, const UString& u2, const UString& u3)
-            : JSCell(globalData, globalData.stringStructure.get())
-            , m_length(u1.length() + u2.length() + u3.length())
-            , m_fiberCount(s_maxInternalRopeLength)
-        {
-            unsigned index = 0;
-            appendStringInConstruct(index, u1);
-            appendStringInConstruct(index, u2);
-            appendStringInConstruct(index, u3);
-            ASSERT(index <= s_maxInternalRopeLength);
         }