<!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>[203892] branches/safari-602-branch/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/203892">203892</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-29 00:12:59 -0700 (Fri, 29 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203793">r203793</a>. rdar://problem/27572612</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceJavaScriptCoreChangeLog">branches/safari-602-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoreruntimeStructurecpp">branches/safari-602-branch/Source/JavaScriptCore/runtime/Structure.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceJavaScriptCoretestsstresssymbolshouldnotbreakforinjs">branches/safari-602-branch/Source/JavaScriptCore/tests/stress/symbol-should-not-break-for-in.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/ChangeLog (203891 => 203892)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-07-29 07:12:56 UTC (rev 203891)
+++ branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-07-29 07:12:59 UTC (rev 203892)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2016-07-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203793. rdar://problem/27572612
+
+ 2016-07-27 Saam Barati <sbarati@apple.com>
+
+ We don't optimize for-in properly in baseline JIT (maybe other JITs too) with an object with symbols
+ https://bugs.webkit.org/show_bug.cgi?id=160211
+ <rdar://problem/27572612>
+
+ Reviewed by Geoffrey Garen.
+
+ The fast for-in iteration mode assumes all inline/out-of-line properties
+ can be iterated in linear order. This is not true if we have Symbols
+ because Symbols should not be iterated by for-in.
+
+ * runtime/Structure.cpp:
+ (JSC::Structure::add):
+ * tests/stress/symbol-should-not-break-for-in.js: Added.
+ (assert):
+ (foo):
+
+2016-07-28 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203790. rdar://problem/27328525
</span><span class="cx">
</span><span class="cx"> 2016-07-27 Mark Lam <mark.lam@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoreruntimeStructurecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/runtime/Structure.cpp (203891 => 203892)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/runtime/Structure.cpp 2016-07-29 07:12:56 UTC (rev 203891)
+++ branches/safari-602-branch/Source/JavaScriptCore/runtime/Structure.cpp 2016-07-29 07:12:59 UTC (rev 203892)
</span><span class="lines">@@ -991,7 +991,7 @@
</span><span class="cx"> ASSERT(!JSC::isValidOffset(get(vm, propertyName)));
</span><span class="cx">
</span><span class="cx"> checkConsistency();
</span><del>- if (attributes & DontEnum)
</del><ins>+ if (attributes & DontEnum || propertyName.isSymbol())
</ins><span class="cx"> setIsQuickPropertyAccessAllowedForEnumeration(false);
</span><span class="cx">
</span><span class="cx"> auto rep = propertyName.uid();
</span><span class="lines">@@ -1051,6 +1051,7 @@
</span><span class="cx"> PropertyTable::iterator end = propertyTable()->end();
</span><span class="cx"> for (PropertyTable::iterator iter = propertyTable()->begin(); iter != end; ++iter) {
</span><span class="cx"> ASSERT(!isQuickPropertyAccessAllowedForEnumeration() || !(iter->attributes & DontEnum));
</span><ins>+ ASSERT(!isQuickPropertyAccessAllowedForEnumeration() || !iter->key->isSymbol());
</ins><span class="cx"> if (!(iter->attributes & DontEnum) || mode.includeDontEnumProperties()) {
</span><span class="cx"> if (iter->key->isSymbol() && !propertyNames.includeSymbolProperties())
</span><span class="cx"> continue;
</span><span class="lines">@@ -1342,6 +1343,7 @@
</span><span class="cx"> PropertyTable::iterator end = propertyTable()->end();
</span><span class="cx"> for (PropertyTable::iterator iter = propertyTable()->begin(); iter != end; ++iter) {
</span><span class="cx"> ASSERT(!(iter->attributes & DontEnum));
</span><ins>+ ASSERT(!iter->key->isSymbol());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoretestsstresssymbolshouldnotbreakforinjs"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/Source/JavaScriptCore/tests/stress/symbol-should-not-break-for-in.js (0 => 203892)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/tests/stress/symbol-should-not-break-for-in.js (rev 0)
+++ branches/safari-602-branch/Source/JavaScriptCore/tests/stress/symbol-should-not-break-for-in.js 2016-07-29 07:12:59 UTC (rev 203892)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+function assert(b) {
+ if (!b)
+ throw new Error("bad assertion.");
+}
+
+function foo(o) {
+ let r = [];
+ for (let p in o)
+ r.push(o[p]);
+ return r;
+}
+noInline(foo);
+
+let o = {};
+o[Symbol()] = "symbol";
+o.prop = "prop";
+for (let i = 0; i < 1000; i++) {
+ let arr = foo(o);
+ assert(arr.length === 1);
+ assert(arr[0] === "prop");
+}
+
+o.prop2 = "prop2";
+for (let i = 0; i < 1000; i++) {
+ let arr = foo(o);
+ assert(arr.length === 2);
+ assert(arr[0] === "prop");
+ assert(arr[1] === "prop2");
+}
</ins></span></pre>
</div>
</div>
</body>
</html>