<!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>[199508] 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/199508">199508</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-04-13 12:04:32 -0700 (Wed, 13 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>PolymorphicAccess::regenerate() shouldn't have to clone non-generated AccessCases
https://bugs.webkit.org/show_bug.cgi?id=156493
Reviewed by Geoffrey Garen.
Cloning AccessCases is only necessary if they hold some artifacts that are used by code that
they already generated. So, if the state is not Generated, we don't have to bother with
cloning them.
This should speed up PolymorphicAccess regeneration a bit more.
* bytecode/PolymorphicAccess.cpp:
(JSC::AccessCase::commit):
(JSC::PolymorphicAccess::regenerate):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodePolymorphicAccesscpp">trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (199507 => 199508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-13 18:52:48 UTC (rev 199507)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-13 19:04:32 UTC (rev 199508)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-04-12 Filip Pizlo <fpizlo@apple.com>
+
+ PolymorphicAccess::regenerate() shouldn't have to clone non-generated AccessCases
+ https://bugs.webkit.org/show_bug.cgi?id=156493
+
+ Reviewed by Geoffrey Garen.
+
+ Cloning AccessCases is only necessary if they hold some artifacts that are used by code that
+ they already generated. So, if the state is not Generated, we don't have to bother with
+ cloning them.
+
+ This should speed up PolymorphicAccess regeneration a bit more.
+
+ * bytecode/PolymorphicAccess.cpp:
+ (JSC::AccessCase::commit):
+ (JSC::PolymorphicAccess::regenerate):
+
</ins><span class="cx"> 2016-04-13 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> ES6: Implement String.prototype.split and RegExp.prototype[@@split].
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodePolymorphicAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp (199507 => 199508)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp 2016-04-13 18:52:48 UTC (rev 199507)
+++ trunk/Source/JavaScriptCore/bytecode/PolymorphicAccess.cpp 2016-04-13 19:04:32 UTC (rev 199508)
</span><span class="lines">@@ -399,7 +399,10 @@
</span><span class="cx">
</span><span class="cx"> Vector<WatchpointSet*, 2> AccessCase::commit(VM& vm, const Identifier& ident)
</span><span class="cx"> {
</span><del>- RELEASE_ASSERT(m_state == Primordial);
</del><ins>+ // It's fine to commit something that is already committed. That arises when we switch to using
+ // newly allocated watchpoints. When it happens, it's not efficient - but we think that's OK
+ // because most AccessCases have no extra watchpoints anyway.
+ RELEASE_ASSERT(m_state == Primordial || m_state == Committed);
</ins><span class="cx">
</span><span class="cx"> Vector<WatchpointSet*, 2> result;
</span><span class="cx">
</span><span class="lines">@@ -1546,28 +1549,36 @@
</span><span class="cx"> // to be unmutated. For sure, we want it to hang onto any data structures that may be referenced
</span><span class="cx"> // from the code of the current stub (aka previous).
</span><span class="cx"> ListType cases;
</span><del>- for (unsigned i = 0; i < m_list.size(); ++i) {
- AccessCase& someCase = *m_list[i];
- // Ignore cases that cannot possibly succeed anymore.
- if (!someCase.couldStillSucceed())
- continue;
</del><ins>+ unsigned srcIndex = 0;
+ unsigned dstIndex = 0;
+ while (srcIndex < m_list.size()) {
+ std::unique_ptr<AccessCase> someCase = WTFMove(m_list[srcIndex++]);
</ins><span class="cx">
</span><del>- // Figure out if this is replaced by any later case.
- bool found = false;
- for (unsigned j = i + 1; j < m_list.size(); ++j) {
- if (m_list[j]->canReplace(someCase)) {
- found = true;
- break;
</del><ins>+ // If the case had been generated, then we have to keep the original in m_list in case we
+ // fail to regenerate. That case may have data structures that are used by the code that it
+ // had generated. If the case had not been generated, then we want to remove it from m_list.
+ bool isGenerated = someCase->state() == AccessCase::Generated;
+
+ [&] () {
+ if (!someCase->couldStillSucceed())
+ return;
+
+ // Figure out if this is replaced by any later case.
+ for (unsigned j = srcIndex; j < m_list.size(); ++j) {
+ if (m_list[j]->canReplace(*someCase))
+ return;
</ins><span class="cx"> }
</span><del>- }
- if (found)
- continue;
</del><ins>+
+ if (isGenerated)
+ cases.append(someCase->clone());
+ else
+ cases.append(WTFMove(someCase));
+ }();
</ins><span class="cx">
</span><del>- // FIXME: Do we have to clone cases that aren't generated? Maybe we can just take those
- // from m_list, since we don't have to keep those alive if we fail.
- // https://bugs.webkit.org/show_bug.cgi?id=156493
- cases.append(someCase.clone());
</del><ins>+ if (isGenerated)
+ m_list[dstIndex++] = WTFMove(someCase);
</ins><span class="cx"> }
</span><ins>+ m_list.resize(dstIndex);
</ins><span class="cx">
</span><span class="cx"> if (verbose)
</span><span class="cx"> dataLog("In regenerate: cases: ", listDump(cases), "\n");
</span></span></pre>
</div>
</div>
</body>
</html>