Title: [207983] releases/WebKitGTK/webkit-2.14/Source/_javascript_Core
Revision
207983
Author
carlo...@webkit.org
Date
2016-10-27 03:43:20 -0700 (Thu, 27 Oct 2016)

Log 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):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ChangeLog (207982 => 207983)


--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ChangeLog	2016-10-27 10:24:26 UTC (rev 207982)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/ChangeLog	2016-10-27 10:43:20 UTC (rev 207983)
@@ -1,3 +1,22 @@
+2016-10-20  Zan Dobersek  <zdober...@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  <mcatanz...@igalia.com>
 
         [GTK] Install binaries to pkglibexecdir rather than bindir

Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/heap/Heap.cpp (207982 => 207983)


--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/heap/Heap.cpp	2016-10-27 10:24:26 UTC (rev 207982)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/heap/Heap.cpp	2016-10-27 10:43:20 UTC (rev 207983)
@@ -1541,7 +1541,7 @@
 public:
     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 
         // the destructor.

Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/heap/HeapCell.h (207982 => 207983)


--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/heap/HeapCell.h	2016-10-27 10:24:26 UTC (rev 207982)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/heap/HeapCell.h	2016-10-27 10:43:20 UTC (rev 207983)
@@ -45,8 +45,8 @@
     
     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;
     CellContainer cellContainer() const;

Modified: releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/heap/MarkedBlock.cpp (207982 => 207983)


--- releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/heap/MarkedBlock.cpp	2016-10-27 10:24:26 UTC (rev 207982)
+++ releases/WebKitGTK/webkit-2.14/Source/_javascript_Core/heap/MarkedBlock.cpp	2016-10-27 10:43:20 UTC (rev 207983)
@@ -148,7 +148,7 @@
             static_cast<JSCell*>(cell)->callDestructor(*vm());
 
         if (sweepMode == SweepToFreeList) {
-            FreeCell* freeCell = reinterpret_cast<FreeCell*>(cell);
+            FreeCell* freeCell = reinterpret_cast_ptr<FreeCell*>(cell);
             if (scribbleMode == Scribble)
                 scribble(freeCell, cellSize());
             freeCell->next = head;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to