<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[207983] releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207983">207983</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-27 03:43:20 -0700 (Thu, 27 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/207659">r207659</a> - 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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapHeapcpp">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapHeapCellh">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/HeapCell.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceJavaScriptCoreheapMarkedBlockcpp">releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedBlock.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog (207982 => 207983)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog 2016-10-27 10:24:26 UTC (rev 207982)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/ChangeLog 2016-10-27 10:43:20 UTC (rev 207983)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+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):
+
</ins><span class="cx"> 2016-09-27 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Install binaries to pkglibexecdir rather than bindir
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/Heap.cpp (207982 => 207983)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/Heap.cpp 2016-10-27 10:24:26 UTC (rev 207982)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/Heap.cpp 2016-10-27 10:43:20 UTC (rev 207983)
</span><span class="lines">@@ -1541,7 +1541,7 @@
</span><span class="cx"> public:
</span><span class="cx"> inline void visit(HeapCell* cell) const
</span><span class="cx"> {
</span><del>- void** current = reinterpret_cast<void**>(cell);
</del><ins>+ void** current = reinterpret_cast_ptr<void**>(cell);
</ins><span class="cx">
</span><span class="cx"> // We want to maintain zapped-ness because that's how we know if we've called
</span><span class="cx"> // the destructor.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapHeapCellh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/HeapCell.h (207982 => 207983)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/HeapCell.h 2016-10-27 10:24:26 UTC (rev 207982)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/HeapCell.h 2016-10-27 10:43:20 UTC (rev 207983)
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx">
</span><span class="cx"> HeapCell() { }
</span><span class="cx">
</span><del>- void zap() { *reinterpret_cast<uintptr_t**>(this) = 0; }
- bool isZapped() const { return !*reinterpret_cast<uintptr_t* const*>(this); }
</del><ins>+ void zap() { *reinterpret_cast_ptr<uintptr_t**>(this) = 0; }
+ bool isZapped() const { return !*reinterpret_cast_ptr<uintptr_t* const*>(this); }
</ins><span class="cx">
</span><span class="cx"> bool isLargeAllocation() const;
</span><span class="cx"> CellContainer cellContainer() const;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceJavaScriptCoreheapMarkedBlockcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedBlock.cpp (207982 => 207983)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedBlock.cpp 2016-10-27 10:24:26 UTC (rev 207982)
+++ releases/WebKitGTK/webkit-2.14/Source/JavaScriptCore/heap/MarkedBlock.cpp 2016-10-27 10:43:20 UTC (rev 207983)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> static_cast<JSCell*>(cell)->callDestructor(*vm());
</span><span class="cx">
</span><span class="cx"> if (sweepMode == SweepToFreeList) {
</span><del>- FreeCell* freeCell = reinterpret_cast<FreeCell*>(cell);
</del><ins>+ FreeCell* freeCell = reinterpret_cast_ptr<FreeCell*>(cell);
</ins><span class="cx"> if (scribbleMode == Scribble)
</span><span class="cx"> scribble(freeCell, cellSize());
</span><span class="cx"> freeCell->next = head;
</span></span></pre>
</div>
</div>
</body>
</html>