Changeset 154426 in webkit for trunk/Source/JavaScriptCore/runtime/Structure.cpp

Timestamp:

Aug 21, 2013, 4:10:38 PM (12 years ago)

Author:

[email protected]

Message:

Rename/refactor setButterfly/setStructure
​https://bugs.webkit.org/show_bug.cgi?id=120138

Reviewed by Geoffrey Garen.

setButterfly becomes setStructureAndButterfly.

Also removed the Butterfly* argument from setStructure and just implicitly
used m_butterfly internally since that's what every single client of setStructure
was doing already.

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/JSObject.cpp:

(JSC::JSObject::notifyPresenceOfIndexedAccessors):
(JSC::JSObject::createInitialUndecided):
(JSC::JSObject::createInitialInt32):
(JSC::JSObject::createInitialDouble):
(JSC::JSObject::createInitialContiguous):
(JSC::JSObject::createArrayStorage):
(JSC::JSObject::convertUndecidedToInt32):
(JSC::JSObject::convertUndecidedToDouble):
(JSC::JSObject::convertUndecidedToContiguous):
(JSC::JSObject::convertUndecidedToArrayStorage):
(JSC::JSObject::convertInt32ToDouble):
(JSC::JSObject::convertInt32ToContiguous):
(JSC::JSObject::convertInt32ToArrayStorage):
(JSC::JSObject::genericConvertDoubleToContiguous):
(JSC::JSObject::convertDoubleToArrayStorage):
(JSC::JSObject::convertContiguousToArrayStorage):
(JSC::JSObject::switchToSlowPutArrayStorage):
(JSC::JSObject::setPrototype):
(JSC::JSObject::putDirectAccessor):
(JSC::JSObject::seal):
(JSC::JSObject::freeze):
(JSC::JSObject::preventExtensions):
(JSC::JSObject::reifyStaticFunctionsForDelete):
(JSC::JSObject::removeDirect):

• runtime/JSObject.h:

(JSC::JSObject::setStructureAndButterfly):
(JSC::JSObject::setStructure):
(JSC::JSObject::putDirectInternal):
(JSC::JSObject::setStructureAndReallocateStorageIfNecessary):
(JSC::JSObject::putDirectWithoutTransition):

• runtime/Structure.cpp:

(JSC::Structure::flattenDictionaryStructure):

File:

• trunk/Source/JavaScriptCore/runtime/Structure.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/Structure.cpp

@@ -707 +707 @@
     // we need to zero it out because the collector depends on the Structure to know the size for copying.
     if (object->butterfly() && !this->outOfLineCapacity() && !this->hasIndexingHeader(object))
-        object->setButterfly(vm, 0, this);
+        object->setStructureAndButterfly(vm, this, 0);
 
     return this;