<!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>[281046] branches/safari-612.1.27.2-branch/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/281046">281046</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2021-08-13 15:14:54 -0700 (Fri, 13 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/280996">r280996</a>. rdar://problem/81901248

    Refactor some ARM64EHash code.
    https://bugs.webkit.org/show_bug.cgi?id=229054

    Reviewed by Keith Miller and Robin Morisset.

    This patch only refactors ARM64EHash code by moving some methods into the private
    section, and removing some unneeded static_casts.

    Verified with a diff of `otool -tv` dumps of the built JavaScriptCore binaries,
    that there are no diffs in the generated code from this change.

    * assembler/AssemblerBuffer.h:
    (JSC::ARM64EHash::ARM64EHash):
    (JSC::ARM64EHash::update):
    (JSC::ARM64EHash::makeDiversifier):
    (JSC::ARM64EHash::nextValue):
    (JSC::ARM64EHash::bitsForDiversifier):
    (JSC::ARM64EHash::currentHash):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280996 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6121272branchSourceJavaScriptCoreChangeLog">branches/safari-612.1.27.2-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6121272branchSourceJavaScriptCoreassemblerAssemblerBufferh">branches/safari-612.1.27.2-branch/Source/JavaScriptCore/assembler/AssemblerBuffer.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6121272branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.2-branch/Source/JavaScriptCore/ChangeLog (281045 => 281046)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.2-branch/Source/JavaScriptCore/ChangeLog        2021-08-13 22:14:51 UTC (rev 281045)
+++ branches/safari-612.1.27.2-branch/Source/JavaScriptCore/ChangeLog   2021-08-13 22:14:54 UTC (rev 281046)
</span><span class="lines">@@ -1,5 +1,53 @@
</span><span class="cx"> 2021-08-13  Russell Epstein  <repstein@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r280996. rdar://problem/81901248
+
+    Refactor some ARM64EHash code.
+    https://bugs.webkit.org/show_bug.cgi?id=229054
+    
+    Reviewed by Keith Miller and Robin Morisset.
+    
+    This patch only refactors ARM64EHash code by moving some methods into the private
+    section, and removing some unneeded static_casts.
+    
+    Verified with a diff of `otool -tv` dumps of the built JavaScriptCore binaries,
+    that there are no diffs in the generated code from this change.
+    
+    * assembler/AssemblerBuffer.h:
+    (JSC::ARM64EHash::ARM64EHash):
+    (JSC::ARM64EHash::update):
+    (JSC::ARM64EHash::makeDiversifier):
+    (JSC::ARM64EHash::nextValue):
+    (JSC::ARM64EHash::bitsForDiversifier):
+    (JSC::ARM64EHash::currentHash):
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280996 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-08-12  Mark Lam  <mark.lam@apple.com>
+
+            Refactor some ARM64EHash code.
+            https://bugs.webkit.org/show_bug.cgi?id=229054
+
+            Reviewed by Keith Miller and Robin Morisset.
+
+            This patch only refactors ARM64EHash code by moving some methods into the private
+            section, and removing some unneeded static_casts.
+
+            Verified with a diff of `otool -tv` dumps of the built JavaScriptCore binaries,
+            that there are no diffs in the generated code from this change.
+
+            * assembler/AssemblerBuffer.h:
+            (JSC::ARM64EHash::ARM64EHash):
+            (JSC::ARM64EHash::update):
+            (JSC::ARM64EHash::makeDiversifier):
+            (JSC::ARM64EHash::nextValue):
+            (JSC::ARM64EHash::bitsForDiversifier):
+            (JSC::ARM64EHash::currentHash):
+
+2021-08-13  Russell Epstein  <repstein@apple.com>
+
</ins><span class="cx">         Cherry-pick r280984. rdar://problem/81901248
</span><span class="cx"> 
</span><span class="cx">     Update ARM64EHash
</span></span></pre></div>
<a id="branchessafari6121272branchSourceJavaScriptCoreassemblerAssemblerBufferh"></a>
<div class="modfile"><h4>Modified: branches/safari-612.1.27.2-branch/Source/JavaScriptCore/assembler/AssemblerBuffer.h (281045 => 281046)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.1.27.2-branch/Source/JavaScriptCore/assembler/AssemblerBuffer.h      2021-08-13 22:14:51 UTC (rev 281045)
+++ branches/safari-612.1.27.2-branch/Source/JavaScriptCore/assembler/AssemblerBuffer.h 2021-08-13 22:14:54 UTC (rev 281046)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008-2019 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2021 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -205,12 +205,27 @@
</span><span class="cx"> #if CPU(ARM64E)
</span><span class="cx">     class ARM64EHash {
</span><span class="cx">     public:
</span><ins>+        ARM64EHash(void* diversifier)
+        {
+            setUpdatedHash(0, 0, diversifier);
+        }
+
+        ALWAYS_INLINE uint32_t update(uint32_t instruction, uint32_t index, void* diversifier)
+        {
+            uint32_t currentHash = this->currentHash(index, diversifier);
+            uint64_t nextIndex = index + 1;
+            uint32_t output = nextValue(instruction, nextIndex, currentHash);
+            setUpdatedHash(output, nextIndex, diversifier);
+            return output;
+        }
+
+    private:
</ins><span class="cx">         static constexpr uint8_t initializationNamespace = 0x11;
</span><span class="cx"> 
</span><span class="cx">         static ALWAYS_INLINE PtrTag makeDiversifier(uint8_t namespaceTag, uint64_t index, uint32_t value)
</span><span class="cx">         {
</span><span class="cx">             // <namespaceTag:8><index:24><value:32>
</span><del>-            return static_cast<PtrTag>((static_cast<uint64_t>(namespaceTag) << 56) + ((index & 0xFFFFFF) << 32) + static_cast<uint64_t>(value));
</del><ins>+            return static_cast<PtrTag>((static_cast<uint64_t>(namespaceTag) << 56) + ((index & 0xFFFFFF) << 32) + value);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         static ALWAYS_INLINE uint32_t nextValue(uint64_t instruction, uint64_t index, uint32_t currentValue)
</span><span class="lines">@@ -217,23 +232,20 @@
</span><span class="cx">         {
</span><span class="cx">             uint64_t a = tagInt(instruction, makeDiversifier(0x12, index, currentValue));
</span><span class="cx">             uint64_t b = tagInt(instruction, makeDiversifier(0x13, index, currentValue));
</span><del>-            return static_cast<uint32_t>((a >> 39) ^ (b >> 23));
</del><ins>+            return (a >> 39) ^ (b >> 23);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         static ALWAYS_INLINE uint32_t bitsForDiversifier(void* diversifier)
</span><span class="cx">         {
</span><del>-            return static_cast<uint32_t>(bitwise_cast<uintptr_t>(diversifier));
</del><ins>+            return bitwise_cast<uintptr_t>(diversifier);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         ALWAYS_INLINE uint32_t currentHash(uint32_t index, void* diversifier)
</span><span class="cx">         {
</span><del>-            uint64_t result;
</del><span class="cx">             bool hashFieldIsTagged = index == 0;
</span><span class="cx">             if (hashFieldIsTagged)
</span><del>-                result = untagInt(m_hash, makeDiversifier(initializationNamespace, index, bitsForDiversifier(diversifier)));
-            else
-                result = m_hash;
-            return static_cast<uint32_t>(result);
</del><ins>+                return untagInt(m_hash, makeDiversifier(initializationNamespace, index, bitsForDiversifier(diversifier)));
+            return m_hash;
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         ALWAYS_INLINE void setUpdatedHash(uint32_t value, uint32_t index, void* diversifier)
</span><span class="lines">@@ -245,21 +257,6 @@
</span><span class="cx">                 m_hash = value;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        ARM64EHash(void* diversifier)
-        {
-            setUpdatedHash(0, 0, diversifier);
-        }

-        ALWAYS_INLINE uint32_t update(uint32_t instruction, uint32_t index, void* diversifier)
-        {
-            uint32_t currentHash = this->currentHash(index, diversifier);
-            uint64_t nextIndex = index + 1;
-            uint32_t output = nextValue(instruction, nextIndex, currentHash);
-            setUpdatedHash(output, nextIndex, diversifier);
-            return output;
-        }
-
-    private:
</del><span class="cx">         uint64_t m_hash;
</span><span class="cx">     };
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>