Changeset 54596 in webkit for trunk/JavaScriptCore/wtf/RefPtr.h

Timestamp:

Feb 10, 2010, 3:59:02 AM (15 years ago)

Author:

[email protected]

Message:

Use derefIfNotNull() to work around WINSCW compiler forward declaration bug

Patch by Yongjun Zhang <​[email protected]> on 2009-10-06
Reviewed by Simon Hausmann.

The compiler bug is reported at
​https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9812.

The change should be reverted when the above bug is fixed in WINSCW compiler.

JObjectWrapper::ref() and deref() made public accessible to derefIfNull().

​https://bugs.webkit.org/show_bug.cgi?id=28054

• bridge/jni/jsc/JavaInstanceJSC.h:
• bridge/jni/v8/JavaInstanceV8.h:

File:

• trunk/JavaScriptCore/wtf/RefPtr.h (modified) (3 diffs)

trunk/JavaScriptCore/wtf/RefPtr.h

@@ -25 +25 @@
 #include "AlwaysInline.h"
 #include "FastAllocBase.h"
+#include "PassRefPtr.h"
 
 namespace WTF {
@@ -51 +52 @@
         bool isHashTableDeletedValue() const { return m_ptr == hashTableDeletedValue(); }
 
-        ~RefPtr() { if (T* ptr = m_ptr) ptr->deref(); }
+        ~RefPtr() { derefIfNotNull(m_ptr); }
         
         template <typename U> RefPtr(const RefPtr<U>& o) : m_ptr(o.get()) { if (T* ptr = m_ptr) ptr->ref(); }
@@ -57 +58 @@
         T* get() const { return m_ptr; }
         
-        void clear() { if (T* ptr = m_ptr) ptr->deref(); m_ptr = 0; }
+        void clear() { derefIfNotNull(m_ptr); m_ptr = 0; }
         PassRefPtr<T> release() { PassRefPtr<T> tmp = adoptRef(m_ptr); m_ptr = 0; return tmp; }