Changeset 155232 in webkit

Timestamp:

Sep 6, 2013 7:35:57 PM (11 years ago)

Author:

akling@apple.com

Message:

Remove old workaround for Nokia's Harmattan GCC on Qt/ARM.
<​https://webkit.org/b/37253>

Reviewed by Anders Carlsson.

Apparently this was a workaround for GCC getting stuck in an infinite loop
when building for ARM in a Nokia SDK over 2 years ago.

I think it's safe to remove this now, but if I'm wrong, and you're reading
this ChangeLog wondering why I did this to you, feel free to put it back in.

• wtf/PassRefPtr.h:

(WTF::refIfNotNull):
(WTF::derefIfNotNull):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/PassRefPtr.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-09-06  Andreas Kling  <akling@apple.com>
+
+        Remove old workaround for Nokia's Harmattan GCC on Qt/ARM.
+        <https://webkit.org/b/37253>
+
+        Reviewed by Anders Carlsson.
+
+        Apparently this was a workaround for GCC getting stuck in an infinite loop
+        when building for ARM in a Nokia SDK over 2 years ago.
+
+        I think it's safe to remove this now, but if I'm wrong, and you're reading
+        this ChangeLog wondering why I did this to you, feel free to put it back in.
+
+        * wtf/PassRefPtr.h:
+        (WTF::refIfNotNull):
+        (WTF::derefIfNotNull):
+
 2013-09-06  Andreas Kling  <akling@apple.com>
 

trunk/Source/WTF/wtf/PassRefPtr.h

@@ -33 +33 @@
     inline void adopted(const void*) { }
 
-#if !(PLATFORM(QT) && CPU(ARM))
-    #define REF_DEREF_INLINE ALWAYS_INLINE
-#else
-    // Older version of gcc used by Harmattan SDK fails to build with ALWAYS_INLINE.
-    // See https://bugs.webkit.org/show_bug.cgi?id=37253 for details.
-    #define REF_DEREF_INLINE inline
-#endif
-
-    template<typename T> REF_DEREF_INLINE void refIfNotNull(T* ptr)
+    template<typename T> ALWAYS_INLINE void refIfNotNull(T* ptr)
     {
         if (LIKELY(ptr != 0))
@@ -47 +39 @@
     }
 
-    template<typename T> REF_DEREF_INLINE void derefIfNotNull(T* ptr)
+    template<typename T> ALWAYS_INLINE void derefIfNotNull(T* ptr)
     {
         if (LIKELY(ptr != 0))
             ptr->deref();
     }
-
-    #undef REF_DEREF_INLINE
 
     template<typename T> class PassRefPtr {