<!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>[285280] branches/safari-612-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/285280">285280</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-11-04 12:39:09 -0700 (Thu, 04 Nov 2021)</dd>
</dl>

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

    Fix spec-correctness when inlining __proto__ intrinsic using get_by_id_with_this
    https://bugs.webkit.org/show_bug.cgi?id=231559

    Reviewed by Yusuke Suzuki.

    My original fix in <a href="http://trac.webkit.org/projects/webkit/changeset/283512">r283512</a> has some theoretical spec correctness issues.
    I'm not sure if they can be materialized or not since we only use
    get_by_id_with_this in very limited scenarios. However, this patch just
    makes it so we call the getter instead of attempting to inline it
    when using get_by_id_with_this.

    * jit/AssemblyHelpers.cpp:
    (JSC::AssemblyHelpers::emitLoadPrototypeWithoutCheck): Deleted.
    * jit/AssemblyHelpers.h:
    * jit/IntrinsicEmitter.cpp:
    (JSC::IntrinsicGetterAccessCase::canEmitIntrinsicGetter):
    (JSC::IntrinsicGetterAccessCase::emitIntrinsicGetter):

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612branchSourceJavaScriptCoreChangeLog">branches/safari-612-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceJavaScriptCorejitIntrinsicEmittercpp">branches/safari-612-branch/Source/JavaScriptCore/jit/IntrinsicEmitter.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/ChangeLog (285279 => 285280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/ChangeLog       2021-11-04 19:39:06 UTC (rev 285279)
+++ branches/safari-612-branch/Source/JavaScriptCore/ChangeLog  2021-11-04 19:39:09 UTC (rev 285280)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2021-11-04  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r284036. rdar://problem/84167629
+
+    Fix spec-correctness when inlining __proto__ intrinsic using get_by_id_with_this
+    https://bugs.webkit.org/show_bug.cgi?id=231559
+    
+    Reviewed by Yusuke Suzuki.
+    
+    My original fix in r283512 has some theoretical spec correctness issues.
+    I'm not sure if they can be materialized or not since we only use
+    get_by_id_with_this in very limited scenarios. However, this patch just
+    makes it so we call the getter instead of attempting to inline it
+    when using get_by_id_with_this.
+    
+    * jit/AssemblyHelpers.cpp:
+    (JSC::AssemblyHelpers::emitLoadPrototypeWithoutCheck): Deleted.
+    * jit/AssemblyHelpers.h:
+    * jit/IntrinsicEmitter.cpp:
+    (JSC::IntrinsicGetterAccessCase::canEmitIntrinsicGetter):
+    (JSC::IntrinsicGetterAccessCase::emitIntrinsicGetter):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284036 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-12  Saam Barati  <sbarati@apple.com>
+
+            Fix spec-correctness when inlining __proto__ intrinsic using get_by_id_with_this
+            https://bugs.webkit.org/show_bug.cgi?id=231559
+
+            Reviewed by Yusuke Suzuki.
+
+            My original fix in r283512 has some theoretical spec correctness issues.
+            I'm not sure if they can be materialized or not since we only use
+            get_by_id_with_this in very limited scenarios. However, this patch just
+            makes it so we call the getter instead of attempting to inline it
+            when using get_by_id_with_this.
+
+            * jit/AssemblyHelpers.cpp:
+            (JSC::AssemblyHelpers::emitLoadPrototypeWithoutCheck): Deleted.
+            * jit/AssemblyHelpers.h:
+            * jit/IntrinsicEmitter.cpp:
+            (JSC::IntrinsicGetterAccessCase::canEmitIntrinsicGetter):
+            (JSC::IntrinsicGetterAccessCase::emitIntrinsicGetter):
+
</ins><span class="cx"> 2021-10-25  Null  <null@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r283600. rdar://problem/84625586
</span></span></pre></div>
<a id="branchessafari612branchSourceJavaScriptCorejitIntrinsicEmittercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/jit/IntrinsicEmitter.cpp (285279 => 285280)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/jit/IntrinsicEmitter.cpp        2021-11-04 19:39:06 UTC (rev 285279)
+++ branches/safari-612-branch/Source/JavaScriptCore/jit/IntrinsicEmitter.cpp   2021-11-04 19:39:09 UTC (rev 285280)
</span><span class="lines">@@ -48,6 +48,13 @@
</span><span class="cx"> 
</span><span class="cx"> bool IntrinsicGetterAccessCase::canEmitIntrinsicGetter(JSFunction* getter, Structure* structure)
</span><span class="cx"> {
</span><ins>+    // We aren't structure checking the this value, so we don't know:
+    // - For type array loads, that it's a typed array.
+    // - For __proto__ getter, that the incoming value is an object,
+    //   and if it overrides getPrototype structure flags.
+    // So for these cases, it's simpler to just call the getter directly.
+    if (stubInfo.thisValueIsInThisGPR())
+        return false;
</ins><span class="cx"> 
</span><span class="cx">     switch (getter->intrinsic()) {
</span><span class="cx">     case TypedArrayByteOffsetIntrinsic:
</span></span></pre>
</div>
</div>

</body>
</html>