<!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>[184009] 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/184009">184009</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2015-05-08 13:07:29 -0700 (Fri, 08 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>MapDataImpl::add() shouldn't do the same hash lookup twice.
https://bugs.webkit.org/show_bug.cgi?id=144759
Reviewed by Gavin Barraclough.
We don't actually need to do a double lookup here, all we need to
do is update the index to point to the correct m_size.
* runtime/MapDataInlines.h:
(JSC::JSIterator>::add):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeMapDataInlinesh">trunk/Source/JavaScriptCore/runtime/MapDataInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (184008 => 184009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-08 19:43:59 UTC (rev 184008)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-08 20:07:29 UTC (rev 184009)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-05-08 Oliver Hunt <oliver@apple.com>
+
+ MapDataImpl::add() shouldn't do the same hash lookup twice.
+ https://bugs.webkit.org/show_bug.cgi?id=144759
+
+ Reviewed by Gavin Barraclough.
+
+ We don't actually need to do a double lookup here, all we need to
+ do is update the index to point to the correct m_size.
+
+ * runtime/MapDataInlines.h:
+ (JSC::JSIterator>::add):
+
</ins><span class="cx"> 2015-05-08 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Micro-optimize JSON serialization of string primitives.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeMapDataInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/MapDataInlines.h (184008 => 184009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/MapDataInlines.h 2015-05-08 19:43:59 UTC (rev 184008)
+++ trunk/Source/JavaScriptCore/runtime/MapDataInlines.h 2015-05-08 20:07:29 UTC (rev 184009)
</span><span class="lines">@@ -91,15 +91,16 @@
</span><span class="cx"> template <typename Map, typename Key>
</span><span class="cx"> inline Entry* MapDataImpl<Entry, JSIterator>::add(ExecState* exec, JSCell* owner, Map& map, Key key, KeyType keyValue)
</span><span class="cx"> {
</span><del>- typename Map::iterator location = map.find(key);
- if (location != map.end())
- return &m_entries[location->value];
</del><ins>+ auto result = map.add(key, m_size);
+ if (!result.isNewEntry)
+ return &m_entries[result.iterator->value];
</ins><span class="cx">
</span><del>- if (!ensureSpaceForAppend(exec, owner))
</del><ins>+ if (!ensureSpaceForAppend(exec, owner)) {
+ map.remove(result.iterator);
</ins><span class="cx"> return 0;
</span><ins>+ }
</ins><span class="cx">
</span><del>- auto result = map.add(key, m_size);
- RELEASE_ASSERT(result.isNewEntry);
</del><ins>+ result.iterator->value = m_size;
</ins><span class="cx"> Entry* entry = &m_entries[m_size++];
</span><span class="cx"> new (entry) Entry();
</span><span class="cx"> entry->setKey(exec->vm(), owner, keyValue.value);
</span><span class="lines">@@ -174,7 +175,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(shouldPack());
</span><span class="cx"> int32_t newEnd = 0;
</span><del>- RELEASE_ASSERT(newCapacity > 0);
</del><ins>+ ASSERT(newCapacity > 0);
+ RELEASE_ASSERT(newCapacity > m_size);
+
</ins><span class="cx"> for (int32_t i = 0; i < m_size; i++) {
</span><span class="cx"> Entry& entry = m_entries[i];
</span><span class="cx"> if (!entry.key()) {
</span><span class="lines">@@ -194,14 +197,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Fixup for the hashmaps
</span><del>- for (auto ptr = m_valueKeyedTable.begin(); ptr != m_valueKeyedTable.end(); ++ptr)
- ptr->value = m_entries[ptr->value].key().get().asInt32();
- for (auto ptr = m_cellKeyedTable.begin(); ptr != m_cellKeyedTable.end(); ++ptr)
- ptr->value = m_entries[ptr->value].key().get().asInt32();
- for (auto ptr = m_stringKeyedTable.begin(); ptr != m_stringKeyedTable.end(); ++ptr)
- ptr->value = m_entries[ptr->value].key().get().asInt32();
- for (auto ptr = m_symbolKeyedTable.begin(); ptr != m_symbolKeyedTable.end(); ++ptr)
- ptr->value = m_entries[ptr->value].key().get().asInt32();
</del><ins>+ for (auto ptr = m_valueKeyedTable.begin(); ptr != m_valueKeyedTable.end(); ++ptr) {
+ if (ptr->value < m_size)
+ ptr->value = m_entries[ptr->value].key().get().asInt32();
+ }
+ for (auto ptr = m_cellKeyedTable.begin(); ptr != m_cellKeyedTable.end(); ++ptr) {
+ if (ptr->value < m_size)
+ ptr->value = m_entries[ptr->value].key().get().asInt32();
+ }
+ for (auto ptr = m_stringKeyedTable.begin(); ptr != m_stringKeyedTable.end(); ++ptr) {
+ if (ptr->value < m_size)
+ ptr->value = m_entries[ptr->value].key().get().asInt32();
+ }
+ for (auto ptr = m_symbolKeyedTable.begin(); ptr != m_symbolKeyedTable.end(); ++ptr) {
+ if (ptr->value < m_size)
+ ptr->value = m_entries[ptr->value].key().get().asInt32();
+ }
</ins><span class="cx">
</span><span class="cx"> ASSERT((m_size - newEnd) == m_deletedCount);
</span><span class="cx"> m_deletedCount = 0;
</span></span></pre>
</div>
</div>
</body>
</html>