<!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>[280687] trunk/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/280687">280687</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-08-05 08:14:42 -0700 (Thu, 05 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use reinterpret_cast_ptr in KeywordLookupGenerator, PropertyMapHashTable
https://bugs.webkit.org/show_bug.cgi?id=228819

Patch by Zan Dobersek <zdobersek@igalia.com> on 2021-08-05
Reviewed by Adrian Perez de Castro.

Switch to using reinterpret_cast_ptr in KeywordLookupGenerator (which
generates the KeywordLookup.h header) and PropertyMapHashTable, reducing
a bit the GCC warning spewage when compiling for targets benefitting
from the reinterpret_cast_ptr workaround.

* KeywordLookupGenerator.py:
* runtime/PropertyMapHashTable.h:
(JSC::PropertyTable::table):
(JSC::PropertyTable::table const):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreKeywordLookupGeneratorpy">trunk/Source/JavaScriptCore/KeywordLookupGenerator.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePropertyMapHashTableh">trunk/Source/JavaScriptCore/runtime/PropertyMapHashTable.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (280686 => 280687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-08-05 15:02:38 UTC (rev 280686)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-08-05 15:14:42 UTC (rev 280687)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-08-05  Zan Dobersek  <zdobersek@igalia.com>
+
+        Use reinterpret_cast_ptr in KeywordLookupGenerator, PropertyMapHashTable
+        https://bugs.webkit.org/show_bug.cgi?id=228819
+
+        Reviewed by Adrian Perez de Castro.
+
+        Switch to using reinterpret_cast_ptr in KeywordLookupGenerator (which
+        generates the KeywordLookup.h header) and PropertyMapHashTable, reducing
+        a bit the GCC warning spewage when compiling for targets benefitting
+        from the reinterpret_cast_ptr workaround.
+
+        * KeywordLookupGenerator.py:
+        * runtime/PropertyMapHashTable.h:
+        (JSC::PropertyTable::table):
+        (JSC::PropertyTable::table const):
+
</ins><span class="cx"> 2021-08-04  Yijia Huang  <yijia_huang@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [ARM64] Fix Zoom black screen during video meeting on Safari
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreKeywordLookupGeneratorpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/KeywordLookupGenerator.py (280686 => 280687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/KeywordLookupGenerator.py    2021-08-05 15:02:38 UTC (rev 280686)
+++ trunk/Source/JavaScriptCore/KeywordLookupGenerator.py       2021-08-05 15:14:42 UTC (rev 280687)
</span><span class="lines">@@ -219,6 +219,8 @@
</span><span class="cx"> trie.fillOut()
</span><span class="cx"> print("// This file was generated by KeywordLookupGenerator.py.  Do not edit.")
</span><span class="cx"> print("""
</span><ins>+#include <wtf/StdLibExtras.h>
+
</ins><span class="cx"> #if CPU(NEEDS_ALIGNED_ACCESS)
</span><span class="cx"> 
</span><span class="cx"> #define COMPARE_2CHARS(address, char1, char2) \\
</span><span class="lines">@@ -258,16 +260,16 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> #define COMPARE_2CHARS(address, char1, char2) \\
</span><del>-    ((reinterpret_cast<const uint16_t*>(address))[0] == CHARPAIR_TOUINT16(char1, char2))
</del><ins>+    ((reinterpret_cast_ptr<const uint16_t*>(address))[0] == CHARPAIR_TOUINT16(char1, char2))
</ins><span class="cx"> #define COMPARE_2UCHARS(address, char1, char2) \\
</span><del>-    ((reinterpret_cast<const uint32_t*>(address))[0] == UCHARPAIR_TOUINT32(char1, char2))
</del><ins>+    ((reinterpret_cast_ptr<const uint32_t*>(address))[0] == UCHARPAIR_TOUINT32(char1, char2))
</ins><span class="cx"> 
</span><span class="cx"> #if CPU(X86_64)
</span><span class="cx"> 
</span><span class="cx"> #define COMPARE_4CHARS(address, char1, char2, char3, char4) \\
</span><del>-    ((reinterpret_cast<const uint32_t*>(address))[0] == CHARQUAD_TOUINT32(char1, char2, char3, char4))
</del><ins>+    ((reinterpret_cast_ptr<const uint32_t*>(address))[0] == CHARQUAD_TOUINT32(char1, char2, char3, char4))
</ins><span class="cx"> #define COMPARE_4UCHARS(address, char1, char2, char3, char4) \\
</span><del>-    ((reinterpret_cast<const uint64_t*>(address))[0] == UCHARQUAD_TOUINT64(char1, char2, char3, char4))
</del><ins>+    ((reinterpret_cast_ptr<const uint64_t*>(address))[0] == UCHARQUAD_TOUINT64(char1, char2, char3, char4))
</ins><span class="cx"> 
</span><span class="cx"> #else // CPU(X86_64)
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePropertyMapHashTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PropertyMapHashTable.h (280686 => 280687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PropertyMapHashTable.h       2021-08-05 15:02:38 UTC (rev 280686)
+++ trunk/Source/JavaScriptCore/runtime/PropertyMapHashTable.h  2021-08-05 15:14:42 UTC (rev 280687)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "WriteBarrier.h"
</span><span class="cx"> #include <wtf/HashTable.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><ins>+#include <wtf/StdLibExtras.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/AtomStringImpl.h>
</span><span class="cx"> 
</span><span class="lines">@@ -548,13 +549,13 @@
</span><span class="cx"> inline PropertyTable::ValueType* PropertyTable::table()
</span><span class="cx"> {
</span><span class="cx">     // The table of values lies after the hash index.
</span><del>-    return reinterpret_cast<ValueType*>(m_index + m_indexSize);
</del><ins>+    return reinterpret_cast_ptr<ValueType*>(m_index + m_indexSize);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> inline const PropertyTable::ValueType* PropertyTable::table() const
</span><span class="cx"> {
</span><span class="cx">     // The table of values lies after the hash index.
</span><del>-    return reinterpret_cast<const ValueType*>(m_index + m_indexSize);
</del><ins>+    return reinterpret_cast_ptr<const ValueType*>(m_index + m_indexSize);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> inline unsigned PropertyTable::usedCount() const
</span></span></pre>
</div>
</div>

</body>
</html>