<!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>[245378] branches/safari-608.1.24-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/245378">245378</a></dd>
<dt>Author</dt> <dd>kocsen_chung@apple.com</dd>
<dt>Date</dt> <dd>2019-05-15 22:43:07 -0700 (Wed, 15 May 2019)</dd>
</dl>

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

    Fix crashes related to pointer authentication for primitive gigacage
    https://bugs.webkit.org/show_bug.cgi?id=197763
    <rdar://problem/50629257>

    Reviewed by Saam Barati.

    This fixes two bugs related to PAC for caging. The first is that
    we didn't clear the high bits of the size register going into the
    patchpoint to tag the new buffer for NewArrayBuffer. The second is
    that the GC needs to strip all stack pointers when considering
    them as a conservative root.

    * ftl/FTLLowerDFGToB3.cpp:
    (JSC::FTL::DFG::LowerDFGToB3::compileNewTypedArray):
    * heap/ConservativeRoots.cpp:
    (JSC::ConservativeRoots::genericAddPointer):

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari608124branchSourceJavaScriptCoreChangeLog">branches/safari-608.1.24-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari608124branchSourceJavaScriptCoreftlFTLLowerDFGToB3cpp">branches/safari-608.1.24-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp</a></li>
<li><a href="#branchessafari608124branchSourceJavaScriptCoreheapConservativeRootscpp">branches/safari-608.1.24-branch/Source/JavaScriptCore/heap/ConservativeRoots.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari608124branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24-branch/Source/JavaScriptCore/ChangeLog (245377 => 245378)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/Source/JavaScriptCore/ChangeLog  2019-05-16 05:43:05 UTC (rev 245377)
+++ branches/safari-608.1.24-branch/Source/JavaScriptCore/ChangeLog     2019-05-16 05:43:07 UTC (rev 245378)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2019-05-15  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r245168. rdar://problem/50629257
+
+    Fix crashes related to pointer authentication for primitive gigacage
+    https://bugs.webkit.org/show_bug.cgi?id=197763
+    <rdar://problem/50629257>
+    
+    Reviewed by Saam Barati.
+    
+    This fixes two bugs related to PAC for caging. The first is that
+    we didn't clear the high bits of the size register going into the
+    patchpoint to tag the new buffer for NewArrayBuffer. The second is
+    that the GC needs to strip all stack pointers when considering
+    them as a conservative root.
+    
+    * ftl/FTLLowerDFGToB3.cpp:
+    (JSC::FTL::DFG::LowerDFGToB3::compileNewTypedArray):
+    * heap/ConservativeRoots.cpp:
+    (JSC::ConservativeRoots::genericAddPointer):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245168 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-09  Keith Miller  <keith_miller@apple.com>
+
+            Fix crashes related to pointer authentication for primitive gigacage
+            https://bugs.webkit.org/show_bug.cgi?id=197763
+            <rdar://problem/50629257>
+
+            Reviewed by Saam Barati.
+
+            This fixes two bugs related to PAC for caging. The first is that
+            we didn't clear the high bits of the size register going into the
+            patchpoint to tag the new buffer for NewArrayBuffer. The second is
+            that the GC needs to strip all stack pointers when considering
+            them as a conservative root.
+
+            * ftl/FTLLowerDFGToB3.cpp:
+            (JSC::FTL::DFG::LowerDFGToB3::compileNewTypedArray):
+            * heap/ConservativeRoots.cpp:
+            (JSC::ConservativeRoots::genericAddPointer):
+
</ins><span class="cx"> 2019-05-09  Xan L√≥pez  <xan@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [CMake] Detect SSE2 at compile time
</span></span></pre></div>
<a id="branchessafari608124branchSourceJavaScriptCoreftlFTLLowerDFGToB3cpp"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (245377 => 245378)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp    2019-05-16 05:43:05 UTC (rev 245377)
+++ branches/safari-608.1.24-branch/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp       2019-05-16 05:43:07 UTC (rev 245378)
</span><span class="lines">@@ -6468,14 +6468,17 @@
</span><span class="cx">                 m_heaps.typedArrayProperties);
</span><span class="cx"> 
</span><span class="cx"> #if !GIGACAGE_ENABLED && CPU(ARM64E)
</span><del>-            PatchpointValue* authenticate = m_out.patchpoint(pointerType());
-            authenticate->appendSomeRegister(storage);
-            authenticate->append(size, B3::ValueRep(B3::ValueRep::SomeLateRegister));
-            authenticate->setGenerator([=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
-                jit.move(params[1].gpr(), params[0].gpr());
-                jit.tagArrayPtr(params[2].gpr(), params[0].gpr());
-            });
-            storage = authenticate;
</del><ins>+            {
+                LValue sizePtr = m_out.zeroExtPtr(size);
+                PatchpointValue* authenticate = m_out.patchpoint(pointerType());
+                authenticate->appendSomeRegister(storage);
+                authenticate->append(sizePtr, B3::ValueRep(B3::ValueRep::SomeLateRegister));
+                authenticate->setGenerator([=] (CCallHelpers& jit, const StackmapGenerationParams& params) {
+                    jit.move(params[1].gpr(), params[0].gpr());
+                    jit.tagArrayPtr(params[2].gpr(), params[0].gpr());
+                });
+                storage = authenticate;
+            }
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">             ValueFromBlock haveStorage = m_out.anchor(storage);
</span></span></pre></div>
<a id="branchessafari608124branchSourceJavaScriptCoreheapConservativeRootscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24-branch/Source/JavaScriptCore/heap/ConservativeRoots.cpp (245377 => 245378)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24-branch/Source/JavaScriptCore/heap/ConservativeRoots.cpp 2019-05-16 05:43:05 UTC (rev 245377)
+++ branches/safari-608.1.24-branch/Source/JavaScriptCore/heap/ConservativeRoots.cpp    2019-05-16 05:43:07 UTC (rev 245378)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> template<typename MarkHook>
</span><span class="cx"> inline void ConservativeRoots::genericAddPointer(void* p, HeapVersion markingVersion, HeapVersion newlyAllocatedVersion, TinyBloomFilter filter, MarkHook& markHook)
</span><span class="cx"> {
</span><ins>+    p = removeArrayPtrTag(p);
</ins><span class="cx">     markHook.mark(p);
</span><span class="cx"> 
</span><span class="cx">     HeapUtil::findGCObjectPointersForMarking(
</span></span></pre>
</div>
</div>

</body>
</html>