Changeset 207983 in webkit

Timestamp:

Oct 27, 2016, 3:43:20 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r207659 - Fix JSC cast-align compiler warnings on ARMv7
​https://bugs.webkit.org/show_bug.cgi?id=163744

Reviewed by Mark Lam.

Use the reinterpret_cast_ptr workaround in a few places where
the cast alignment warning is being thrown by the GCC compiler
when compiling for the ARMv7 architecture.

• heap/Heap.cpp:

(JSC::Zombify::visit):

• heap/HeapCell.h:

(JSC::HeapCell::zap):
(JSC::HeapCell::isZapped):

• heap/MarkedBlock.cpp:

(JSC::MarkedBlock::Handle::specializedSweep):

Location:

releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/Heap.cpp (modified) (1 diff)
• heap/HeapCell.h (modified) (1 diff)
• heap/MarkedBlock.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-10-20  Zan Dobersek  <zdobersek@igalia.com>
+
+        Fix JSC cast-align compiler warnings on ARMv7
+        https://bugs.webkit.org/show_bug.cgi?id=163744
+
+        Reviewed by Mark Lam.
+
+        Use the reinterpret_cast_ptr workaround in a few places where
+        the cast alignment warning is being thrown by the GCC compiler
+        when compiling for the ARMv7 architecture.
+
+        * heap/Heap.cpp:
+        (JSC::Zombify::visit):
+        * heap/HeapCell.h:
+        (JSC::HeapCell::zap):
+        (JSC::HeapCell::isZapped):
+        * heap/MarkedBlock.cpp:
+        (JSC::MarkedBlock::Handle::specializedSweep):
+
 2016-09-27  Michael Catanzaro  <mcatanzaro@igalia.com>
 

releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/Heap.cpp

@@ -1542 +1542 @@
     inline void visit(HeapCell* cell) const
     {
-        void** current = reinterpret_cast<void**>(cell);
+        void** current = reinterpret_cast_ptr<void**>(cell);
 
         // We want to maintain zapped-ness because that's how we know if we've called 

releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/HeapCell.h

@@ -46 +46 @@
     HeapCell() { }
     
-    void zap() { *reinterpret_cast<uintptr_t**>(this) = 0; }
-    bool isZapped() const { return !*reinterpret_cast<uintptr_t* const*>(this); }
+    void zap() { *reinterpret_cast_ptr<uintptr_t**>(this) = 0; }
+    bool isZapped() const { return !*reinterpret_cast_ptr<uintptr_t* const*>(this); }
     
     bool isLargeAllocation() const;

releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedBlock.cpp

@@ -149 +149 @@
 
         if (sweepMode == SweepToFreeList) {
-            FreeCell* freeCell = reinterpret_cast<FreeCell*>(cell);
+            FreeCell* freeCell = reinterpret_cast_ptr<FreeCell*>(cell);
             if (scribbleMode == Scribble)
                 scribble(freeCell, cellSize());