Changeset 86209 in webkit for trunk/Source/JavaScriptCore/heap/Handle.h

Timestamp:

May 10, 2011, 7:29:51 PM (14 years ago)

Author:

[email protected]

Message:

2011-05-10 Geoffrey Garen <​[email protected]>

Reviewed by Darin Adler.

Fixed up some #include dependencies so the WriteBarrier class can actually call Heap::writeBarrier
​https://bugs.webkit.org/show_bug.cgi?id=60532

• GNUmakefile.list.am:
• JavaScriptCore.gypi:
• JavaScriptCore.xcodeproj/project.pbxproj: Build!

• heap/Handle.h: Moved HandleTypes to its own header because that's the WebKit style, and it was necessary to resolve a circular dependency between Handle.h and WriteBarrier.h.

• heap/Heap.h: (JSC::Heap::writeBarrier): Added an inline no-op writeBarrier(), to verify that all the code is in the right place.

• heap/MarkStack.h: Moved WriteBarrier operations to WriteBarrier.h to resolve a circular dependency.

• runtime/ArgList.h:
• runtime/JSCell.h: #include WriteBarrier.h since we don't get it for free anymore.

• runtime/PropertyMapHashTable.h: (JSC::PropertyTable::PropertyTable): Call the real writeBarrier() function, now that it exists.

• runtime/SmallStrings.h: Removed a stray #include to resolve a circular dependency.

• runtime/WriteBarrier.h: (JSC::WriteBarrierBase::set): (JSC::MarkStack::append): (JSC::MarkStack::appendValues): Updated to match the changes above.

File:

• trunk/Source/JavaScriptCore/heap/Handle.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/heap/Handle.h

@@ -27 +27 @@
 #define Handle_h
 
-#include "WriteBarrier.h"
-#include <wtf/Assertions.h>
+#include "HandleTypes.h"
 
 namespace JSC {
@@ -76 +75 @@
 private:
     HandleSlot m_slot;
-};
-
-template <typename T> struct HandleTypes {
-    typedef T* ExternalType;
-    static ExternalType getFromSlot(HandleSlot slot) { return (slot && *slot) ? reinterpret_cast<ExternalType>(slot->asCell()) : 0; }
-    static JSValue toJSValue(T* cell) { return reinterpret_cast<JSCell*>(cell); }
-    template <typename U> static void validateUpcast() { T* temp; temp = (U*)0; }
-};
-
-template <> struct HandleTypes<Unknown> {
-    typedef JSValue ExternalType;
-    static ExternalType getFromSlot(HandleSlot slot) { return slot ? *slot : JSValue(); }
-    static JSValue toJSValue(const JSValue& v) { return v; }
-    template <typename U> static void validateUpcast() {}
 };