<!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>[175249] 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/175249">175249</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-10-28 08:29:51 -0700 (Tue, 28 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Holes are not copied properly when Arrays change shape to ArrayStorage type.
<https://webkit.org/b/138118>
Reviewed by Mark Hahnenberg.
When we convert non-ArrayStorage typed arrays into ArrayStorage typed arrays,
we skipped the holes. As a result, the slots in the ArrayStorage vector that
corresponds to those holes are uninitialize. This is now fixed.
* runtime/JSObject.cpp:
(JSC::JSObject::convertUndecidedToArrayStorage):
(JSC::JSObject::convertInt32ToArrayStorage):
(JSC::JSObject::convertDoubleToArrayStorage):
(JSC::JSObject::convertContiguousToArrayStorage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (175248 => 175249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-10-28 14:14:50 UTC (rev 175248)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-10-28 15:29:51 UTC (rev 175249)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-10-27 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Holes are not copied properly when Arrays change shape to ArrayStorage type.
+ <https://webkit.org/b/138118>
+
+ Reviewed by Mark Hahnenberg.
+
+ When we convert non-ArrayStorage typed arrays into ArrayStorage typed arrays,
+ we skipped the holes. As a result, the slots in the ArrayStorage vector that
+ corresponds to those holes are uninitialize. This is now fixed.
+
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::convertUndecidedToArrayStorage):
+ (JSC::JSObject::convertInt32ToArrayStorage):
+ (JSC::JSObject::convertDoubleToArrayStorage):
+ (JSC::JSObject::convertContiguousToArrayStorage):
+
+2014-10-27 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> Crash when attempting to perform array iteration on a non-array with numeric keys not initialized.
</span><span class="cx"> <https://webkit.org/b/137814>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.cpp (175248 => 175249)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2014-10-28 14:14:50 UTC (rev 175248)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2014-10-28 15:29:51 UTC (rev 175249)
</span><span class="lines">@@ -732,6 +732,7 @@
</span><span class="cx"> unsigned vectorLength = m_butterfly->vectorLength();
</span><span class="cx"> ArrayStorage* storage = constructConvertedArrayStorageWithoutCopyingElements(vm, vectorLength);
</span><span class="cx"> // No need to copy elements.
</span><ins>+ ASSERT(!m_butterfly->publicLength());
</ins><span class="cx">
</span><span class="cx"> Structure* newStructure = Structure::nonPropertyTransition(vm, structure(vm), transition);
</span><span class="cx"> setStructureAndButterfly(vm, newStructure, storage->butterfly());
</span><span class="lines">@@ -778,12 +779,13 @@
</span><span class="cx">
</span><span class="cx"> unsigned vectorLength = m_butterfly->vectorLength();
</span><span class="cx"> ArrayStorage* newStorage = constructConvertedArrayStorageWithoutCopyingElements(vm, vectorLength);
</span><del>- for (unsigned i = m_butterfly->publicLength(); i--;) {
</del><ins>+ for (unsigned i = 0; i < m_butterfly->publicLength(); i++) {
</ins><span class="cx"> JSValue v = m_butterfly->contiguous()[i].get();
</span><del>- if (!v)
- continue;
- newStorage->m_vector[i].setWithoutWriteBarrier(v);
- newStorage->m_numValuesInVector++;
</del><ins>+ if (v) {
+ newStorage->m_vector[i].setWithoutWriteBarrier(v);
+ newStorage->m_numValuesInVector++;
+ } else
+ newStorage->m_vector[i].clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Structure* newStructure = Structure::nonPropertyTransition(vm, structure(vm), transition);
</span><span class="lines">@@ -847,12 +849,13 @@
</span><span class="cx">
</span><span class="cx"> unsigned vectorLength = m_butterfly->vectorLength();
</span><span class="cx"> ArrayStorage* newStorage = constructConvertedArrayStorageWithoutCopyingElements(vm, vectorLength);
</span><del>- for (unsigned i = m_butterfly->publicLength(); i--;) {
</del><ins>+ for (unsigned i = 0; i < m_butterfly->publicLength(); i++) {
</ins><span class="cx"> double value = m_butterfly->contiguousDouble()[i];
</span><del>- if (value != value)
- continue;
- newStorage->m_vector[i].setWithoutWriteBarrier(JSValue(JSValue::EncodeAsDouble, value));
- newStorage->m_numValuesInVector++;
</del><ins>+ if (value == value) {
+ newStorage->m_vector[i].setWithoutWriteBarrier(JSValue(JSValue::EncodeAsDouble, value));
+ newStorage->m_numValuesInVector++;
+ } else
+ newStorage->m_vector[i].clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Structure* newStructure = Structure::nonPropertyTransition(vm, structure(vm), transition);
</span><span class="lines">@@ -872,12 +875,13 @@
</span><span class="cx">
</span><span class="cx"> unsigned vectorLength = m_butterfly->vectorLength();
</span><span class="cx"> ArrayStorage* newStorage = constructConvertedArrayStorageWithoutCopyingElements(vm, vectorLength);
</span><del>- for (unsigned i = m_butterfly->publicLength(); i--;) {
</del><ins>+ for (unsigned i = 0; i < m_butterfly->publicLength(); i++) {
</ins><span class="cx"> JSValue v = m_butterfly->contiguous()[i].get();
</span><del>- if (!v)
- continue;
- newStorage->m_vector[i].setWithoutWriteBarrier(v);
- newStorage->m_numValuesInVector++;
</del><ins>+ if (v) {
+ newStorage->m_vector[i].setWithoutWriteBarrier(v);
+ newStorage->m_numValuesInVector++;
+ } else
+ newStorage->m_vector[i].clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Structure* newStructure = Structure::nonPropertyTransition(vm, structure(vm), transition);
</span></span></pre>
</div>
</div>
</body>
</html>