Unreviewed, rolling out r105676.

http://trac.webkit.org/changeset/105676
https://bugs.webkit.org/show_bug.cgi?id=76665

Breaks build on max due to compile warnings.

* runtime/JSObject.cpp:
(JSC::JSObject::finalize):
(JSC::JSObject::visitChildren):
(JSC::JSObject::allocatePropertyStorage):
* runtime/JSObject.h:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105682 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent cc75f55e
2012-01-23 Luke Macpherson <macpherson@chromium.org>
Unreviewed, rolling out r105676.
http://trac.webkit.org/changeset/105676
https://bugs.webkit.org/show_bug.cgi?id=76665
Breaks build on max due to compile warnings.
* runtime/JSObject.cpp:
(JSC::JSObject::finalize):
(JSC::JSObject::visitChildren):
(JSC::JSObject::allocatePropertyStorage):
* runtime/JSObject.h:
2012-01-23 Mark Hahnenberg <mhahnenberg@apple.com>
Use copying collector for out-of-line JSObject property storage
......@@ -24,7 +24,6 @@
#include "config.h"
#include "JSObject.h"
#include "BumpSpaceInlineMethods.h"
#include "DatePrototype.h"
#include "ErrorConstructor.h"
#include "GetterSetter.h"
......@@ -84,6 +83,11 @@ static inline void getClassPropertyNames(ExecState* exec, const ClassInfo* class
}
}
void JSObject::finalize(JSCell* cell)
{
delete [] jsCast<JSObject*>(cell)->m_propertyStorage.get();
}
void JSObject::destroy(JSCell* cell)
{
jsCast<JSObject*>(cell)->JSObject::~JSObject();
......@@ -102,13 +106,7 @@ void JSObject::visitChildren(JSCell* cell, SlotVisitor& visitor)
PropertyStorage storage = thisObject->propertyStorage();
size_t storageSize = thisObject->structure()->propertyStorageSize();
if (thisObject->isUsingInlineStorage())
visitor.appendValues(storage, storageSize);
else {
visitor.copyAndAppend(reinterpret_cast<void**>(&storage), thisObject->structure()->propertyStorageCapacity() * sizeof(WriteBarrierBase<Unknown>), storage->slot(), storageSize);
thisObject->m_propertyStorage.set(storage, StorageBarrier::Unchecked);
}
visitor.appendValues(storage, storageSize);
if (thisObject->m_inheritorID)
visitor.append(&thisObject->m_inheritorID);
......@@ -635,23 +633,20 @@ void JSObject::allocatePropertyStorage(JSGlobalData& globalData, size_t oldSize,
// It's important that this function not rely on structure(), since
// we might be in the middle of a transition.
PropertyStorage newPropertyStorage = 0;
newPropertyStorage = new WriteBarrierBase<Unknown>[newSize];
PropertyStorage oldPropertyStorage = m_propertyStorage.get();
PropertyStorage newPropertyStorage = 0;
ASSERT(newPropertyStorage);
if (isUsingInlineStorage()) {
if (!globalData.heap.tryAllocateStorage(sizeof(WriteBarrierBase<Unknown>) * newSize, reinterpret_cast<void**>(&newPropertyStorage)))
CRASH();
for (unsigned i = 0; i < oldSize; ++i)
newPropertyStorage[i] = oldPropertyStorage[i];
for (unsigned i = 0; i < oldSize; ++i)
newPropertyStorage[i] = oldPropertyStorage[i];
} else {
if (!globalData.heap.tryReallocateStorage(reinterpret_cast<void**>(&oldPropertyStorage), sizeof(WriteBarrierBase<Unknown>) * oldSize, sizeof(WriteBarrierBase<Unknown>) * newSize))
CRASH();
newPropertyStorage = oldPropertyStorage;
}
if (isUsingInlineStorage())
Heap::heap(this)->addFinalizer(this, &finalize);
else
delete [] oldPropertyStorage;
ASSERT(newPropertyStorage);
m_propertyStorage.set(globalData, this, newPropertyStorage);
}
......
......@@ -90,6 +90,8 @@ namespace JSC {
JS_EXPORT_PRIVATE static UString className(const JSObject*);
static void finalize(JSCell*);
JSValue prototype() const;
void setPrototype(JSGlobalData&, JSValue prototype);
bool setPrototypeWithCycleCheck(JSGlobalData&, JSValue prototype);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment