Changeset 155258 in webkit

Timestamp:

Sep 7, 2013 12:45:41 PM (11 years ago)

Author:

andersca@apple.com

Message:

VectorMover should use std::move
​https://bugs.webkit.org/show_bug.cgi?id=120959

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Work around a bug in GCC by changing the type of the callType bitfield
in CallLinkInfo to be unsigned instead of CallType.

• bytecode/CallLinkInfo.h:

Source/WTF:

This lets the compiler use move constructors when moving data, which can be a performance improvement.
If the vector element type isn't movable it will be copied instead.

• wtf/Vector.h:

(WTF::VectorTypeOperations::move):
(WTF::VectorTypeOperations::moveOverlapping):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/bytecode/CallLinkInfo.h (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Vector.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-09-07  Anders Carlsson  <andersca@apple.com>
+
+        VectorMover should use std::move
+        https://bugs.webkit.org/show_bug.cgi?id=120959
+
+        Reviewed by Geoffrey Garen.
+
+        Work around a bug in GCC by changing the type of the callType bitfield 
+        in CallLinkInfo to be unsigned instead of CallType.
+
+        * bytecode/CallLinkInfo.h:
+
 2013-09-07  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/CallLinkInfo.h

@@ -83 +83 @@
     bool isDFG : 1;
     bool hasSeenClosure : 1;
-    CallType callType : 5;
+    unsigned callType : 5; // CallType
     unsigned calleeGPR : 8;
     CodeOrigin codeOrigin;

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-09-07  Anders Carlsson  <andersca@apple.com>
+
+        VectorMover should use std::move
+        https://bugs.webkit.org/show_bug.cgi?id=120959
+
+        Reviewed by Geoffrey Garen.
+
+        This lets the compiler use move constructors when moving data, which can be a performance improvement.
+        If the vector element type isn't movable it will be copied instead.
+
+        * wtf/Vector.h:
+        (WTF::VectorTypeOperations::move):
+        (WTF::VectorTypeOperations::moveOverlapping):
+
 2013-09-07  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WTF/wtf/Vector.h

@@ -91 +91 @@
 struct VectorMover<false, T>
 {
-    static void move(const T* src, const T* srcEnd, T* dst)
+    static void move(T* src, T* srcEnd, T* dst)
     {
         while (src != srcEnd) {
-            new (NotNull, dst) T(*src);
-#if COMPILER(SUNCC) && __SUNPRO_CC <= 0x590
-            const_cast<T*>(src)->~T(); // Work around obscure SunCC 12 compiler bug.
-#else
+            new (NotNull, dst) T(std::move(*src));
             src->~T();
-#endif
             ++dst;
             ++src;
         }
     }
-    static void moveOverlapping(const T* src, const T* srcEnd, T* dst)
+    static void moveOverlapping(T* src, T* srcEnd, T* dst)
     {
         if (src > dst)
@@ -113 +109 @@
                 --srcEnd;
                 --dstEnd;
-                new (NotNull, dstEnd) T(*srcEnd);
+                new (NotNull, dstEnd) T(std::move(*srcEnd));
                 srcEnd->~T();
             }
@@ -223 +219 @@
     }
 
-    static void move(const T* src, const T* srcEnd, T* dst)
+    static void move(T* src, T* srcEnd, T* dst)
     {
         VectorMover<VectorTraits<T>::canMoveWithMemcpy, T>::move(src, srcEnd, dst);
     }
 
-    static void moveOverlapping(const T* src, const T* srcEnd, T* dst)
+    static void moveOverlapping(T* src, T* srcEnd, T* dst)
     {
         VectorMover<VectorTraits<T>::canMoveWithMemcpy, T>::moveOverlapping(src, srcEnd, dst);