Changeset 155484 in webkit

Timestamp:

Sep 10, 2013, 3:36:23 PM (13 years ago)

Author:

andersca@apple.com

Message:

More WTF/Alignment.h removal
​https://bugs.webkit.org/show_bug.cgi?id=121125

Reviewed by Andreas Kling.

Source/WebCore:

• platform/PODArena.h:

Source/WTF:

• wtf/Alignment.h:
• wtf/Vector.h:

(WTF::VectorBuffer::swap):
(WTF::VectorBuffer::inlineBuffer):

• wtf/text/ASCIIFastPath.h:

(WTF::isAlignedTo):
(WTF::isAlignedToMachineWord):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Alignment.h (modified) (1 diff)
• WTF/wtf/Vector.h (modified) (4 diffs)
• WTF/wtf/text/ASCIIFastPath.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/PODArena.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-09-10  Anders Carlsson  <andersca@apple.com>
+
+        More WTF/Alignment.h removal
+        https://bugs.webkit.org/show_bug.cgi?id=121125
+
+        Reviewed by Andreas Kling.
+
+        * wtf/Alignment.h:
+        * wtf/Vector.h:
+        (WTF::VectorBuffer::swap):
+        (WTF::VectorBuffer::inlineBuffer):
+        * wtf/text/ASCIIFastPath.h:
+        (WTF::isAlignedTo):
+        (WTF::isAlignedToMachineWord):
+
 2013-09-10  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WTF/wtf/Alignment.h

@@ -61 +61 @@
     }
 
-    template <uintptr_t mask>
-    inline bool isAlignedTo(const void* pointer)
-    {
-        return !(reinterpret_cast<uintptr_t>(pointer) & mask);
-    }
 }
 

trunk/Source/WTF/wtf/Vector.h

@@ -22 +22 @@
 #define WTF_Vector_h
 
-#include <wtf/Alignment.h>
+#include <limits>
+#include <string.h>
+#include <type_traits>
+#include <utility>
 #include <wtf/CheckedArithmetic.h>
 #include <wtf/FastMalloc.h>
@@ -31 +34 @@
 #include <wtf/ValueCheck.h>
 #include <wtf/VectorTraits.h>
-#include <limits>
-#include <string.h>
-#include <utility>
 
 namespace WTF {
@@ -456 +456 @@
     }
 
-    void swap(VectorBuffer<T, inlineCapacity>& other)
+    void swap(VectorBuffer& other)
     {
         if (buffer() == inlineBuffer() && other.buffer() == other.inlineBuffer()) {
-            WTF::swap(m_inlineBuffer, other.m_inlineBuffer);
+            std::swap_ranges(m_inlineBuffer, m_inlineBuffer + inlineCapacity, other.m_inlineBuffer);
             std::swap(m_capacity, other.m_capacity);
         } else if (buffer() == inlineBuffer()) {
             m_buffer = other.m_buffer;
             other.m_buffer = other.inlineBuffer();
-            WTF::swap(m_inlineBuffer, other.m_inlineBuffer);
+            std::swap_ranges(m_inlineBuffer, m_inlineBuffer + inlineCapacity, other.m_inlineBuffer);
             std::swap(m_capacity, other.m_capacity);
         } else if (other.buffer() == other.inlineBuffer()) {
             other.m_buffer = m_buffer;
             m_buffer = inlineBuffer();
-            WTF::swap(m_inlineBuffer, other.m_inlineBuffer);
+            std::swap_ranges(m_inlineBuffer, m_inlineBuffer + inlineCapacity, other.m_inlineBuffer);
             std::swap(m_capacity, other.m_capacity);
         } else {
@@ -502 +502 @@
     using Base::m_capacity;
 
-    static const size_t m_inlineBufferSize = inlineCapacity * sizeof(T);
-    T* inlineBuffer() { return reinterpret_cast_ptr<T*>(m_inlineBuffer.buffer); }
-    const T* inlineBuffer() const { return reinterpret_cast_ptr<const T*>(m_inlineBuffer.buffer); }
-
-    AlignedBuffer<m_inlineBufferSize, WTF_ALIGN_OF(T)> m_inlineBuffer;
+    T* inlineBuffer() { return reinterpret_cast_ptr<T*>(m_inlineBuffer); }
+    const T* inlineBuffer() const { return reinterpret_cast_ptr<const T*>(m_inlineBuffer); }
+
+    typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type m_inlineBuffer[inlineCapacity];
 };
 

trunk/Source/WTF/wtf/text/ASCIIFastPath.h

@@ -33 +33 @@
 namespace WTF {
 
+template <uintptr_t mask>
+inline bool isAlignedTo(const void* pointer)
+{
+    return !(reinterpret_cast<uintptr_t>(pointer) & mask);
+}
+
 // Assuming that a pointer is the size of a "machine word", then
 // uintptr_t is an integer type that is also a machine word.
@@ -40 +46 @@
 inline bool isAlignedToMachineWord(const void* pointer)
 {
-    return !(reinterpret_cast<uintptr_t>(pointer) & machineWordAlignmentMask);
+    return isAlignedTo<machineWordAlignmentMask>(pointer);
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-10  Anders Carlsson  <andersca@apple.com>
+
+        More WTF/Alignment.h removal
+        https://bugs.webkit.org/show_bug.cgi?id=121125
+
+        Reviewed by Andreas Kling.
+
+        * platform/PODArena.h:
+
 2013-09-10  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/platform/PODArena.h

@@ -28 +28 @@
 
 #include <stdint.h>
+#include <wtf/Alignment.h>
 #include <wtf/Assertions.h>
 #include <wtf/FastMalloc.h>