Changeset 190113 in webkit for trunk/Source/JavaScriptCore/heap/WeakInlines.h

Timestamp:

Sep 22, 2015, 5:21:31 AM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r189616.
​https://bugs.webkit.org/show_bug.cgi?id=149456

suspected cause of multiple regressions (Requested by kling on
#webkit).

Reverted changeset:

"[JSC] Weak should only accept cell pointees."
​https://bugs.webkit.org/show_bug.cgi?id=148955
​http://trac.webkit.org/changeset/189616

File:

• trunk/Source/JavaScriptCore/heap/WeakInlines.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/heap/WeakInlines.h

@@ -35 +35 @@
 
 template<typename T> inline Weak<T>::Weak(T* cell, WeakHandleOwner* weakOwner, void* context)
-    : m_impl(cell ? WeakSet::allocate(*cell, weakOwner, context) : 0)
+    : m_impl(cell ? WeakSet::allocate(cell, weakOwner, context) : 0)
 {
-    static_assert((std::is_convertible<T, JSCell>::value), "JSC::Weak can only be used with cell types.");
 }
 
@@ -75 +74 @@
 {
     ASSERT(m_impl && m_impl->state() == WeakImpl::Live);
-    return jsCast<T*>(m_impl->cell());
+    return jsCast<T*>(m_impl->jsValue().asCell());
 }
 
@@ -81 +80 @@
 {
     ASSERT(m_impl && m_impl->state() == WeakImpl::Live);
-    return *jsCast<T*>(m_impl->cell());
+    return *jsCast<T*>(m_impl->jsValue().asCell());
 }
 
@@ -88 +87 @@
     if (!m_impl || m_impl->state() != WeakImpl::Live)
         return 0;
-    return jsCast<T*>(m_impl->cell());
+    return jsCast<T*>(m_impl->jsValue().asCell());
 }
 
 template<typename T> inline bool Weak<T>::was(T* other) const
 {
-    return static_cast<T*>(m_impl->cell()) == other;
+    return static_cast<T*>(m_impl->jsValue().asCell()) == other;
 }
 
 template<typename T> inline bool Weak<T>::operator!() const
 {
-    return !m_impl || !m_impl->cell() || m_impl->state() != WeakImpl::Live;
+    return !m_impl || !m_impl->jsValue() || m_impl->state() != WeakImpl::Live;
 }