Changeset 64684 in webkit for trunk/JavaScriptCore/runtime/JSCell.h

Timestamp:

Aug 4, 2010, 3:21:13 PM (15 years ago)

Author:

[email protected]

Message:

2010-08-04 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r64655.
​http://trac.webkit.org/changeset/64655
​https://bugs.webkit.org/show_bug.cgi?id=43496

JavaScriptCore references patch seems to have caused
regressions in QT and GTK builds (Requested by nlawrence on
#webkit).

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::markAggregate):
• runtime/Collector.cpp: (JSC::Heap::markConservatively):
• runtime/JSCell.h: (JSC::JSValue::asCell): (JSC::MarkStack::append):
• runtime/JSGlobalObject.cpp: (JSC::markIfNeeded):
• runtime/JSONObject.cpp: (JSC::Stringifier::Holder::object):
• runtime/JSObject.h: (JSC::JSObject::prototype):
• runtime/JSStaticScopeObject.cpp: (JSC::JSStaticScopeObject::markChildren):
• runtime/JSValue.h: (JSC::JSValue::): (JSC::JSValue::JSValue): (JSC::JSValue::asCell):
• runtime/MarkStack.h:
• runtime/NativeErrorConstructor.cpp:
• runtime/NativeErrorConstructor.h:
• runtime/Structure.h: (JSC::Structure::storedPrototype):

2010-08-04 Sheriff Bot <​[email protected]>

Unreviewed, rolling out r64655.
​http://trac.webkit.org/changeset/64655
​https://bugs.webkit.org/show_bug.cgi?id=43496

JavaScriptCore references patch seems to have caused
regressions in QT and GTK builds (Requested by nlawrence on
#webkit).

• JSValueWrapper.cpp: (JSValueWrapper::JSObjectMark):

File:

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

trunk/JavaScriptCore/runtime/JSCell.h

@@ -36 +36 @@
 
     class JSCell : public NoncopyableCustomAllocated {
-        friend class CollectorHeap;
         friend class GetterSetter;
         friend class Heap;
@@ -239 +238 @@
 
 #if !USE(JSVALUE32_64)
-    ALWAYS_INLINE JSCell*& JSValue::asCell()
-    {
-        ASSERT(isCell());
-        return m_ptr;
-    }
-
-    ALWAYS_INLINE JSCell* const& JSValue::asCell() const
+    ALWAYS_INLINE JSCell* JSValue::asCell() const
     {
         ASSERT(isCell());
@@ -337 +330 @@
     }
 
-    template<typename T>
-    ALWAYS_INLINE void MarkStack::append(T*& cell)
-    {
-        // References in C++ are not covariant.  JSObject* being a subtype of JSCell*
-        // does not mean that JSObject*& can be used as a subtype of JSCell*& because
-        // treating a JSObject*& as a JSCell*& would allow us to change the pointer to
-        // point to something that is a JSCell but not a JSObject.
-        //
-        // In this case, we need to be able to change the pointer, and although we know
-        // it to be safe, C++ doesn't, requiring us to use templated functions that
-        // pass a casted version to an internal function.
-        //
-        // Currently we're not doing anything with the value of the pointer, so nothing
-        // unsafe will happen.  In the future, when we have movable objects, we will be
-        // changing the value of the pointer to be the new location, in which case the
-        // type will be preserved.
-        JSCell*& ptr = *reinterpret_cast<JSCell**>(&cell);
-        appendInternal(ptr);
-    }
-
-    ALWAYS_INLINE void MarkStack::append(JSValue& value)
-    {
-        ASSERT(value);
-        if (value.isCell())
-            appendInternal(value.asCell());
-    }
-
-    ALWAYS_INLINE void MarkStack::append(Register& reg)
-    {
-        JSValue value = reg.jsValue();
-        append(value);
-        reg = value;
-    }
-
-    inline void MarkStack::appendInternal(JSCell*& cell)
+    ALWAYS_INLINE void MarkStack::append(JSCell* cell)
     {
         ASSERT(!m_isCheckingForDefaultMarkViolation);
@@ -382 +341 @@
     }
 
+    ALWAYS_INLINE void MarkStack::append(JSValue value)
+    {
+        ASSERT(value);
+        if (value.isCell())
+            append(value.asCell());
+    }
+
     inline Heap* Heap::heap(JSValue v)
     {