Changeset 113209 in webkit for trunk/Source/JavaScriptCore/heap

Timestamp:

Apr 4, 2012, 10:17:32 AM (13 years ago)

Author:

[email protected]

Message:

[Qt] REGRESSION(r113141): All tests assert on 32 bit debug mode
​https://bugs.webkit.org/show_bug.cgi?id=83139

Reviewed by Sam Weinig.

• heap/PassWeak.h:

(JSC::::get): 32-bit JSValue treats JSValue(nullptr).asCell() as an error,
so work around that here. (Long-term, we should make 32-bit and 64-bit
agree on the right behavior.)

File:

• trunk/Source/JavaScriptCore/heap/PassWeak.h (modified) (1 diff)

trunk/Source/JavaScriptCore/heap/PassWeak.h

@@ -106 +106 @@
 template<typename Base, typename T> inline typename WeakImplAccessor<Base, T>::GetType WeakImplAccessor<Base, T>::get() const
 {
-    if (!static_cast<const Base*>(this)->m_impl || static_cast<const Base*>(this)->m_impl->state() != WeakImpl::Live)
+    if (!static_cast<const Base*>(this)->m_impl || static_cast<const Base*>(this)->m_impl->state() != WeakImpl::Live || !static_cast<const Base*>(this)->m_impl->jsValue())
         return GetType();
     return jsCast<T*>(static_cast<const Base*>(this)->m_impl->jsValue().asCell());