<!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>[190682] 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/190682">190682</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-07 13:27:46 -0700 (Wed, 07 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't setOutOfBounds in JIT code for PutByVal, since the C++ slow path already does it
https://bugs.webkit.org/show_bug.cgi?id=149885
Reviewed by Geoffrey Garen.
This simplifies the slow path code, which will make it easier to put read barriers on all of
the butterflies.
* jit/JITOperations.cpp:
(JSC::getByVal):
* jit/JITPropertyAccess.cpp:
(JSC::JIT::emitSlow_op_put_by_val):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOperationscpp">trunk/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccesscpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (190681 => 190682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-07 20:25:29 UTC (rev 190681)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-07 20:27:46 UTC (rev 190682)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-10-07 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ Don't setOutOfBounds in JIT code for PutByVal, since the C++ slow path already does it
+ https://bugs.webkit.org/show_bug.cgi?id=149885
+
+ Reviewed by Geoffrey Garen.
+
+ This simplifies the slow path code, which will make it easier to put read barriers on all of
+ the butterflies.
+
+ * jit/JITOperations.cpp:
+ (JSC::getByVal):
+ * jit/JITPropertyAccess.cpp:
+ (JSC::JIT::emitSlow_op_put_by_val):
+
+2015-10-07 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> Get rid of JIT::compilePutDirectOffset
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149884
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.cpp (190681 => 190682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2015-10-07 20:25:29 UTC (rev 190681)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2015-10-07 20:27:46 UTC (rev 190682)
</span><span class="lines">@@ -401,6 +401,9 @@
</span><span class="cx"> if (object->canSetIndexQuickly(i))
</span><span class="cx"> object->setIndexQuickly(callFrame->vm(), i, value);
</span><span class="cx"> else {
</span><ins>+ // FIXME: This will make us think that in-bounds typed array accesses are actually
+ // out-of-bounds.
+ // https://bugs.webkit.org/show_bug.cgi?id=149886
</ins><span class="cx"> byValInfo->arrayProfile->setOutOfBounds();
</span><span class="cx"> object->methodTable(vm)->putByIndex(object, callFrame, i, value, callFrame->codeBlock()->isStrictMode());
</span><span class="cx"> }
</span><span class="lines">@@ -434,6 +437,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // FIXME: This will make us think that in-bounds typed array accesses are actually
+ // out-of-bounds.
+ // https://bugs.webkit.org/show_bug.cgi?id=149886
</ins><span class="cx"> byValInfo->arrayProfile->setOutOfBounds();
</span><span class="cx"> baseObject->putDirectIndex(callFrame, index, value, 0, isStrictMode ? PutDirectIndexShouldThrow : PutDirectIndexShouldNotThrow);
</span><span class="cx"> return;
</span><span class="lines">@@ -1588,8 +1594,12 @@
</span><span class="cx"> if (object->canGetIndexQuickly(i))
</span><span class="cx"> return object->getIndexQuickly(i);
</span><span class="cx">
</span><del>- if (!canAccessArgumentIndexQuickly(*object, i))
</del><ins>+ if (!canAccessArgumentIndexQuickly(*object, i)) {
+ // FIXME: This will make us think that in-bounds typed array accesses are actually
+ // out-of-bounds.
+ // https://bugs.webkit.org/show_bug.cgi?id=149886
</ins><span class="cx"> byValInfo->arrayProfile->setOutOfBounds();
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return baseValue.get(exec, i);
</span><span class="lines">@@ -1750,8 +1760,12 @@
</span><span class="cx"> if (object->canGetIndexQuickly(index))
</span><span class="cx"> return JSValue::encode(JSValue(JSValue::JSTrue));
</span><span class="cx">
</span><del>- if (!canAccessArgumentIndexQuickly(*object, index))
</del><ins>+ if (!canAccessArgumentIndexQuickly(*object, index)) {
+ // FIXME: This will make us think that in-bounds typed array accesses are actually
+ // out-of-bounds.
+ // https://bugs.webkit.org/show_bug.cgi?id=149886
</ins><span class="cx"> byValInfo->arrayProfile->setOutOfBounds();
</span><ins>+ }
</ins><span class="cx"> return JSValue::encode(jsBoolean(object->hasProperty(exec, index)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1770,8 +1784,12 @@
</span><span class="cx"> if (object->canGetIndexQuickly(index))
</span><span class="cx"> return JSValue::encode(JSValue(JSValue::JSTrue));
</span><span class="cx">
</span><del>- if (!canAccessArgumentIndexQuickly(*object, index))
</del><ins>+ if (!canAccessArgumentIndexQuickly(*object, index)) {
+ // FIXME: This will make us think that in-bounds typed array accesses are actually
+ // out-of-bounds.
+ // https://bugs.webkit.org/show_bug.cgi?id=149886
</ins><span class="cx"> byValInfo->arrayProfile->setOutOfBounds();
</span><ins>+ }
</ins><span class="cx"> return JSValue::encode(jsBoolean(object->hasProperty(exec, subscript.asUInt32())));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (190681 => 190682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2015-10-07 20:25:29 UTC (rev 190681)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2015-10-07 20:27:46 UTC (rev 190682)
</span><span class="lines">@@ -448,6 +448,8 @@
</span><span class="cx"> linkSlowCase(iter); // property int32 check
</span><span class="cx"> linkSlowCase(iter); // base not array check
</span><span class="cx">
</span><ins>+ linkSlowCase(iter); // out of bounds
+
</ins><span class="cx"> JITArrayMode mode = chooseArrayMode(profile);
</span><span class="cx"> switch (mode) {
</span><span class="cx"> case JITInt32:
</span><span class="lines">@@ -458,11 +460,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Jump skipProfiling = jump();
- linkSlowCase(iter); // out of bounds
- emitArrayProfileOutOfBoundsSpecialCase(profile);
- skipProfiling.link(this);
-
</del><span class="cx"> Label slowPath = label();
</span><span class="cx">
</span><span class="cx"> emitGetVirtualRegister(base, regT0);
</span></span></pre>
</div>
</div>
</body>
</html>