<!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>[172850] branches/safari-600.1-branch</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/172850">172850</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-08-21 22:20:08 -0700 (Thu, 21 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/172707">r172707</a>. <rdar://problem/18043281></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001branchLayoutTestsjsbasicmapexpectedtxt">branches/safari-600.1-branch/LayoutTests/js/basic-map-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestsjsbasicsetexpectedtxt">branches/safari-600.1-branch/LayoutTests/js/basic-set-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestsjsscripttestsbasicmapjs">branches/safari-600.1-branch/LayoutTests/js/script-tests/basic-map.js</a></li>
<li><a href="#branchessafari6001branchLayoutTestsjsscripttestsbasicsetjs">branches/safari-600.1-branch/LayoutTests/js/script-tests/basic-set.js</a></li>
<li><a href="#branchessafari6001branchSourceJavaScriptCoreChangeLog">branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceJavaScriptCoreruntimeJSMapIteratorh">branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSMapIterator.h</a></li>
<li><a href="#branchessafari6001branchSourceJavaScriptCoreruntimeJSSetIteratorh">branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSSetIterator.h</a></li>
<li><a href="#branchessafari6001branchSourceJavaScriptCoreruntimeMapDatah">branches/safari-600.1-branch/Source/JavaScriptCore/runtime/MapData.h</a></li>
<li><a href="#branchessafari6001branchSourceJavaScriptCoreruntimeMapIteratorPrototypecpp">branches/safari-600.1-branch/Source/JavaScriptCore/runtime/MapIteratorPrototype.cpp</a></li>
<li><a href="#branchessafari6001branchSourceJavaScriptCoreruntimeSetIteratorPrototypecpp">branches/safari-600.1-branch/Source/JavaScriptCore/runtime/SetIteratorPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (172849 => 172850)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-22 04:21:18 UTC (rev 172849)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-08-22 05:20:08 UTC (rev 172850)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-08-21 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r172707. <rdar://problem/18043281>
+
+ 2014-08-18 Diego Pino Garcia <dpino@igalia.com>
+
+ Completed iterator can be revived by adding more than one new entry to the target object
+ https://bugs.webkit.org/show_bug.cgi?id=129993
+
+ Reviewed by Oliver Hunt.
+
+ Test a Map or Set iterator should remain dead after using it.
+
+ * js/basic-map-expected.txt:
+ * js/basic-set-expected.txt:
+ * js/script-tests/basic-map.js:
+ (set var):
+ (set map):
+ * js/script-tests/basic-set.js:
+ (keys.set keys):
+ (set add.set add):
+
</ins><span class="cx"> 2014-08-19 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172727. <rdar://problem/18051847>
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestsjsbasicmapexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/js/basic-map-expected.txt (172849 => 172850)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/js/basic-map-expected.txt 2014-08-22 04:21:18 UTC (rev 172849)
+++ branches/safari-600.1-branch/LayoutTests/js/basic-map-expected.txt 2014-08-22 05:20:08 UTC (rev 172850)
</span><span class="lines">@@ -222,6 +222,10 @@
</span><span class="cx"> PASS value is 14
</span><span class="cx"> PASS i is 5
</span><span class="cx"> PASS map.size is 4
</span><ins>+A dead iterator should remain dead
+PASS count is 0
+PASS count is 3
+PASS count is 3
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestsjsbasicsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/js/basic-set-expected.txt (172849 => 172850)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/js/basic-set-expected.txt 2014-08-22 04:21:18 UTC (rev 172849)
+++ branches/safari-600.1-branch/LayoutTests/js/basic-set-expected.txt 2014-08-22 05:20:08 UTC (rev 172850)
</span><span class="lines">@@ -193,6 +193,10 @@
</span><span class="cx"> PASS key is 7
</span><span class="cx"> PASS i is 5
</span><span class="cx"> PASS set.size is 4
</span><ins>+A dead iterator should remain dead
+PASS count is 0
+PASS count is 3
+PASS count is 3
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestsjsscripttestsbasicmapjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/js/script-tests/basic-map.js (172849 => 172850)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/js/script-tests/basic-map.js 2014-08-22 04:21:18 UTC (rev 172849)
+++ branches/safari-600.1-branch/LayoutTests/js/script-tests/basic-map.js 2014-08-22 05:20:08 UTC (rev 172850)
</span><span class="lines">@@ -246,3 +246,35 @@
</span><span class="cx"> shouldBe("i", "5")
</span><span class="cx"> shouldBe("map.size", "4");
</span><span class="cx">
</span><ins>+debug("A dead iterator should remain dead")
+
+var map = new Map;
+map.set(1, "foo");
+var keys = map.keys()
+// Iterator reaches end and becomes dead.
+for (key of keys) {
+ // Do nothing
+}
+map.set(2, "bar")
+map.set(3, "wibble")
+
+// Iterator 'keys' remains dead.
+var count = 0;
+for (key of keys) {
+ count++;
+}
+shouldBe("count", "0");
+
+// New assignment creates a new iterator.
+keys = map.keys();
+for (key of keys) {
+ count++;
+}
+shouldBe("count", "3");
+
+// Iterating through map.keys()
+count = 0;
+for (key of map.keys()) {
+ count++;
+}
+shouldBe("count", "3");
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestsjsscripttestsbasicsetjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/js/script-tests/basic-set.js (172849 => 172850)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/js/script-tests/basic-set.js 2014-08-22 04:21:18 UTC (rev 172849)
+++ branches/safari-600.1-branch/LayoutTests/js/script-tests/basic-set.js 2014-08-22 05:20:08 UTC (rev 172850)
</span><span class="lines">@@ -205,3 +205,36 @@
</span><span class="cx"> }
</span><span class="cx"> shouldBe("i", "5")
</span><span class="cx"> shouldBe("set.size", "4");
</span><ins>+
+debug("A dead iterator should remain dead")
+
+var set = new Set;
+set.add("foo");
+var keys = set.keys()
+// Iterator reaches end and becomes dead.
+for (key of keys) {
+ // Do nothing
+}
+set.add("bar")
+set.add("wibble")
+
+// Iterator 'keys' remains dead.
+var count = 0;
+for (key of keys) {
+ count++;
+}
+shouldBe("count", "0");
+
+// New assignment creates a new iterator.
+keys = set.keys();
+for (key of keys) {
+ count++;
+}
+shouldBe("count", "3");
+
+// Iterating through set.keys()
+count = 0;
+for (key of set.keys()) {
+ count++;
+}
+shouldBe("count", "3");
</ins></span></pre></div>
<a id="branchessafari6001branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog (172849 => 172850)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog 2014-08-22 04:21:18 UTC (rev 172849)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/ChangeLog 2014-08-22 05:20:08 UTC (rev 172850)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-08-21 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r172707. <rdar://problem/18043281>
+
+ 2014-08-18 Diego Pino Garcia <dpino@igalia.com>
+
+ Completed iterator can be revived by adding more than one new entry to the target object
+ https://bugs.webkit.org/show_bug.cgi?id=129993
+
+ Reviewed by Oliver Hunt.
+
+ When iterator reaches end, finish iterator.
+
+ * runtime/JSMapIterator.h:
+ (JSC::JSMapIterator::finish):
+ * runtime/JSSetIterator.h:
+ (JSC::JSSetIterator::finish):
+ * runtime/MapData.h:
+ (JSC::MapData::const_iterator::finish): set index of iterator to max
+ Int32.
+ * runtime/MapIteratorPrototype.cpp:
+ (JSC::MapIteratorPrototypeFuncNext):
+ * runtime/SetIteratorPrototype.cpp:
+ (JSC::SetIteratorPrototypeFuncNext):
+
</ins><span class="cx"> 2014-08-20 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172805
</span></span></pre></div>
<a id="branchessafari6001branchSourceJavaScriptCoreruntimeJSMapIteratorh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSMapIterator.h (172849 => 172850)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSMapIterator.h 2014-08-22 04:21:18 UTC (rev 172849)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSMapIterator.h 2014-08-22 05:20:08 UTC (rev 172850)
</span><span class="lines">@@ -70,6 +70,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void finish()
+ {
+ m_iterator.finish();
+ }
+
</ins><span class="cx"> private:
</span><span class="cx">
</span><span class="cx"> static const unsigned StructureFlags = Base::StructureFlags | OverridesVisitChildren;
</span></span></pre></div>
<a id="branchessafari6001branchSourceJavaScriptCoreruntimeJSSetIteratorh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSSetIterator.h (172849 => 172850)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSSetIterator.h 2014-08-22 04:21:18 UTC (rev 172849)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/runtime/JSSetIterator.h 2014-08-22 05:20:08 UTC (rev 172850)
</span><span class="lines">@@ -68,6 +68,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void finish()
+ {
+ m_iterator.finish();
+ }
+
</ins><span class="cx"> private:
</span><span class="cx">
</span><span class="cx"> static const unsigned StructureFlags = Base::StructureFlags | OverridesVisitChildren;
</span></span></pre></div>
<a id="branchessafari6001branchSourceJavaScriptCoreruntimeMapDatah"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/JavaScriptCore/runtime/MapData.h (172849 => 172850)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/runtime/MapData.h 2014-08-22 04:21:18 UTC (rev 172849)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/runtime/MapData.h 2014-08-22 05:20:08 UTC (rev 172850)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> static const_iterator end(const MapData*);
</span><span class="cx"> bool operator!=(const const_iterator& other);
</span><span class="cx"> bool operator==(const const_iterator& other);
</span><ins>+ void finish() { m_index = std::numeric_limits<int32_t>::max(); }
</ins><span class="cx">
</span><span class="cx"> bool ensureSlot();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceJavaScriptCoreruntimeMapIteratorPrototypecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/JavaScriptCore/runtime/MapIteratorPrototype.cpp (172849 => 172850)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/runtime/MapIteratorPrototype.cpp 2014-08-22 04:21:18 UTC (rev 172849)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/runtime/MapIteratorPrototype.cpp 2014-08-22 05:20:08 UTC (rev 172850)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> JSValue result;
</span><span class="cx"> if (iterator->next(callFrame, result))
</span><span class="cx"> return JSValue::encode(result);
</span><ins>+ iterator->finish();
</ins><span class="cx"> return JSValue::encode(callFrame->vm().iterationTerminator.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceJavaScriptCoreruntimeSetIteratorPrototypecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/JavaScriptCore/runtime/SetIteratorPrototype.cpp (172849 => 172850)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/JavaScriptCore/runtime/SetIteratorPrototype.cpp 2014-08-22 04:21:18 UTC (rev 172849)
+++ branches/safari-600.1-branch/Source/JavaScriptCore/runtime/SetIteratorPrototype.cpp 2014-08-22 05:20:08 UTC (rev 172850)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> if (iterator->next(callFrame, result))
</span><span class="cx"> return JSValue::encode(result);
</span><del>-
</del><ins>+ iterator->finish();
</ins><span class="cx"> return JSValue::encode(callFrame->vm().iterationTerminator.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>