Changeset 128851 in webkit for trunk/Source/JavaScriptCore/runtime/JSCell.h

Timestamp:

Sep 17, 2012, 11:00:21 PM (13 years ago)

Author:

Csaba Osztrogonác

Message:

Unreviewed, rolling out r128826 and r128813.

Source/JavaScriptCore:

• API/JSCallbackConstructor.cpp:

(JSC):
(JSC::JSCallbackConstructor::JSCallbackConstructor):

• API/JSCallbackConstructor.h:

(JSCallbackConstructor):

• API/JSCallbackObject.cpp:

(JSC):
(JSC::::createStructure):

• API/JSCallbackObject.h:

(JSC::JSCallbackObject::create):
(JSCallbackObject):

• API/JSClassRef.cpp:

(OpaqueJSClass::prototype):

• API/JSObjectRef.cpp:

(JSObjectMake):
(JSObjectGetPrivate):
(JSObjectSetPrivate):
(JSObjectGetPrivateProperty):
(JSObjectSetPrivateProperty):
(JSObjectDeletePrivateProperty):

• API/JSValueRef.cpp:

(JSValueIsObjectOfClass):

• API/JSWeakObjectMapRefPrivate.cpp:
• GNUmakefile.list.am:
• JSCTypedArrayStubs.h:

(JSC):

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::emitAllocateBasicJSObject):
(JSC::DFG::SpeculativeJIT::emitAllocateJSFinalObject):

• heap/Heap.cpp:

(JSC::Heap::isSafeToSweepStructures):
(JSC):

• heap/Heap.h:

(JSC::Heap::allocatorForObjectWithDestructor):
(Heap):
(JSC::Heap::allocateWithDestructor):
(JSC::Heap::allocateStructure):
(JSC):

• heap/IncrementalSweeper.cpp:

(JSC::IncrementalSweeper::IncrementalSweeper):
(JSC::IncrementalSweeper::sweepNextBlock):
(JSC::IncrementalSweeper::startSweeping):
(JSC::IncrementalSweeper::willFinishSweeping):
(JSC::IncrementalSweeper::structuresCanBeSwept):
(JSC):

• heap/IncrementalSweeper.h:

(IncrementalSweeper):

• heap/MarkedAllocator.cpp:

(JSC::MarkedAllocator::tryAllocateHelper):
(JSC::MarkedAllocator::allocateBlock):

• heap/MarkedAllocator.h:

(JSC::MarkedAllocator::cellsNeedDestruction):
(JSC::MarkedAllocator::onlyContainsStructures):
(MarkedAllocator):
(JSC::MarkedAllocator::MarkedAllocator):
(JSC::MarkedAllocator::init):

• heap/MarkedBlock.cpp:

(JSC::MarkedBlock::create):
(JSC::MarkedBlock::MarkedBlock):
(JSC):
(JSC::MarkedBlock::specializedSweep):
(JSC::MarkedBlock::sweep):
(JSC::MarkedBlock::sweepHelper):

• heap/MarkedBlock.h:

(JSC):
(MarkedBlock):
(JSC::MarkedBlock::cellsNeedDestruction):
(JSC::MarkedBlock::onlyContainsStructures):

• heap/MarkedSpace.cpp:

(JSC::MarkedSpace::MarkedSpace):
(JSC::MarkedSpace::resetAllocators):
(JSC::MarkedSpace::canonicalizeCellLivenessData):
(JSC::MarkedSpace::isPagedOut):
(JSC::MarkedSpace::freeBlock):

• heap/MarkedSpace.h:

(MarkedSpace):
(Subspace):
(JSC::MarkedSpace::allocatorFor):
(JSC::MarkedSpace::destructorAllocatorFor):
(JSC::MarkedSpace::allocateWithDestructor):
(JSC::MarkedSpace::allocateStructure):
(JSC::MarkedSpace::forEachBlock):

• heap/SlotVisitor.cpp:
• jit/JIT.h:
• jit/JITInlineMethods.h:

(JSC::JIT::emitAllocateBasicJSObject):
(JSC::JIT::emitAllocateJSFinalObject):
(JSC::JIT::emitAllocateJSArray):

• jsc.cpp:

(GlobalObject::create):

• runtime/Arguments.cpp:

(JSC):

• runtime/Arguments.h:

(Arguments):
(JSC::Arguments::Arguments):

• runtime/ErrorPrototype.cpp:

(JSC):

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

(JSC):
(JSC::InternalFunction::InternalFunction):

• runtime/InternalFunction.h:

(InternalFunction):

• runtime/JSCell.h:

(JSC):
(JSC::allocateCell):

• runtime/JSDestructibleObject.h: Removed.
• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::reset):
(JSC):

• runtime/JSGlobalObject.h:

(JSGlobalObject):
(JSC::JSGlobalObject::createRareDataIfNeeded):
(JSC::JSGlobalObject::create):

• runtime/JSGlobalThis.h:

(JSGlobalThis):
(JSC::JSGlobalThis::JSGlobalThis):

• runtime/JSPropertyNameIterator.h:
• runtime/JSScope.cpp:

(JSC):

• runtime/JSString.h:

(JSC):

• runtime/JSWrapperObject.h:

(JSWrapperObject):
(JSC::JSWrapperObject::JSWrapperObject):

• runtime/MathObject.cpp:

(JSC):

• runtime/NameInstance.h:

(NameInstance):

• runtime/RegExp.h:
• runtime/RegExpObject.cpp:

(JSC):

• runtime/SparseArrayValueMap.h:
• runtime/Structure.h:

(JSC::Structure):
(JSC::JSCell::classInfo):
(JSC):

• runtime/StructureChain.h:
• runtime/SymbolTable.h:
• testRegExp.cpp:

(GlobalObject::create):

Source/WebCore:

• ForwardingHeaders/runtime/JSDestructibleObject.h: Removed.
• bindings/js/JSDOMWrapper.h:

(WebCore::JSDOMWrapper::JSDOMWrapper):

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateHeader):

• bridge/objc/objc_runtime.h:

(ObjcFallbackObjectImp):

• bridge/objc/objc_runtime.mm:

(Bindings):
(JSC::Bindings::ObjcFallbackObjectImp::ObjcFallbackObjectImp):

• bridge/runtime_array.cpp:

(JSC):
(JSC::RuntimeArray::destroy):

• bridge/runtime_array.h:

(JSC::RuntimeArray::create):

• bridge/runtime_object.cpp:

(Bindings):
(JSC::Bindings::RuntimeObject::RuntimeObject):

• bridge/runtime_object.h:

(RuntimeObject):

Source/WebKit2:

• WebProcess/Plugins/Netscape/JSNPObject.cpp:

(WebKit):
(WebKit::JSNPObject::JSNPObject):

• WebProcess/Plugins/Netscape/JSNPObject.h:

(JSNPObject):

File:

• trunk/Source/JavaScriptCore/runtime/JSCell.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/runtime/JSCell.h

@@ -37 +37 @@
 namespace JSC {
 
-    class JSDestructibleObject;
     class JSGlobalObject;
     class LLIntOffsetsExtractor;
@@ -323 +322 @@
 #endif
 
-    template<class T>
-    struct HasImmortalStructure {
-        static const bool value = false;
-    };
-
-#define HAS_IMMORTAL_STRUCTURE(klass) \
-    template <> \
-    struct HasImmortalStructure<klass> {\
-        static const bool value = true;\
-    }
-
-#define NEEDS_DESTRUCTOR(klass, v) \
-    template <> \
-    struct NeedsDestructor<klass> {\
-        static const bool value = v;\
-    }
-
     template<typename T>
     void* allocateCell(Heap& heap)
@@ -348 +330 @@
 #endif
         JSCell* result = 0;
-        if (NeedsDestructor<T>::value && HasImmortalStructure<T>::value)
-            result = static_cast<JSCell*>(heap.allocateWithImmortalStructureDestructor(sizeof(T)));
-        else if (NeedsDestructor<T>::value && !HasImmortalStructure<T>::value)
-            result = static_cast<JSCell*>(heap.allocateWithNormalDestructor(sizeof(T)));
-        else
+        if (NeedsDestructor<T>::value)
+            result = static_cast<JSCell*>(heap.allocateWithDestructor(sizeof(T)));
+        else {
+            ASSERT(T::s_info.methodTable.destroy == JSCell::destroy);
             result = static_cast<JSCell*>(heap.allocateWithoutDestructor(sizeof(T)));
+        }
         result->clearStructure();
         return result;
@@ -367 +349 @@
 #endif
         JSCell* result = 0;
-        if (NeedsDestructor<T>::value && HasImmortalStructure<T>::value)
-            result = static_cast<JSCell*>(heap.allocateWithImmortalStructureDestructor(size));
-        else if (NeedsDestructor<T>::value && !HasImmortalStructure<T>::value)
-            result = static_cast<JSCell*>(heap.allocateWithNormalDestructor(size));
+        if (NeedsDestructor<T>::value)
+            result = static_cast<JSCell*>(heap.allocateWithDestructor(size));
         else {
             ASSERT(T::s_info.methodTable.destroy == JSCell::destroy);
@@ -390 +370 @@
         return static_cast<To>(from);
     }
-    
+
     template<typename To>
     inline To jsCast(JSValue from)