<!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>[204093] trunk</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/204093">204093</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-08-03 11:50:57 -0700 (Wed, 03 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/203368">r203368</a>): broke some test262 tests
https://bugs.webkit.org/show_bug.cgi?id=160479
Reviewed by Mark Lam.
JSTests:
Added a stress test for this case, since we don't always run test262.
* stress/freeze-setter.js: Added.
(let.o.set foo):
Source/JavaScriptCore:
The optimization in <a href="http://trac.webkit.org/projects/webkit/changeset/203368">r203368</a> overlooked a subtle detail: freezing should not set ReadOnly on
Accessor properties.
* runtime/Structure.cpp:
(JSC::Structure::nonPropertyTransition):
* runtime/StructureTransitionTable.h:
(JSC::setsDontDeleteOnAllProperties):
(JSC::setsReadOnlyOnNonAccessorProperties):
(JSC::setsReadOnlyOnAllProperties): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructurecpp">trunk/Source/JavaScriptCore/runtime/Structure.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructureTransitionTableh">trunk/Source/JavaScriptCore/runtime/StructureTransitionTable.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressfreezesetterjs">trunk/JSTests/stress/freeze-setter.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (204092 => 204093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-08-03 18:44:04 UTC (rev 204092)
+++ trunk/JSTests/ChangeLog 2016-08-03 18:50:57 UTC (rev 204093)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-03 Filip Pizlo <fpizlo@apple.com>
+
+ REGRESSION(r203368): broke some test262 tests
+ https://bugs.webkit.org/show_bug.cgi?id=160479
+
+ Reviewed by Mark Lam.
+
+ Added a stress test for this case, since we don't always run test262.
+
+ * stress/freeze-setter.js: Added.
+ (let.o.set foo):
+
</ins><span class="cx"> 2016-08-03 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement nested rest destructuring w.r.t the ES7 spec
</span></span></pre></div>
<a id="trunkJSTestsstressfreezesetterjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/freeze-setter.js (0 => 204093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/freeze-setter.js (rev 0)
+++ trunk/JSTests/stress/freeze-setter.js 2016-08-03 18:50:57 UTC (rev 204093)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+//@ runDefault
+
+"use strict";
+
+let x;
+
+let o = {
+ set foo(value)
+ {
+ x = value;
+ }
+};
+
+Object.freeze(o);
+
+o.foo = 42;
+
+if (x != 42)
+ throw "Error: bad result: " + x;
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (204092 => 204093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-03 18:44:04 UTC (rev 204092)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-03 18:50:57 UTC (rev 204093)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-08-03 Filip Pizlo <fpizlo@apple.com>
+
+ REGRESSION(r203368): broke some test262 tests
+ https://bugs.webkit.org/show_bug.cgi?id=160479
+
+ Reviewed by Mark Lam.
+
+ The optimization in r203368 overlooked a subtle detail: freezing should not set ReadOnly on
+ Accessor properties.
+
+ * runtime/Structure.cpp:
+ (JSC::Structure::nonPropertyTransition):
+ * runtime/StructureTransitionTable.h:
+ (JSC::setsDontDeleteOnAllProperties):
+ (JSC::setsReadOnlyOnNonAccessorProperties):
+ (JSC::setsReadOnlyOnAllProperties): Deleted.
+
</ins><span class="cx"> 2016-08-03 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Lacking support on a arm-traditional disassembler.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructurecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Structure.cpp (204092 => 204093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Structure.cpp 2016-08-03 18:44:04 UTC (rev 204092)
+++ trunk/Source/JavaScriptCore/runtime/Structure.cpp 2016-08-03 18:50:57 UTC (rev 204093)
</span><span class="lines">@@ -652,12 +652,8 @@
</span><span class="cx"> if (preventsExtensions(transitionKind))
</span><span class="cx"> transition->setDidPreventExtensions(true);
</span><span class="cx">
</span><del>- unsigned additionalPropertyAttributes = 0;
- if (setsDontDeleteOnAllProperties(transitionKind))
- additionalPropertyAttributes |= DontDelete;
- if (setsReadOnlyOnAllProperties(transitionKind))
- additionalPropertyAttributes |= ReadOnly;
- if (additionalPropertyAttributes) {
</del><ins>+ if (setsDontDeleteOnAllProperties(transitionKind)
+ || setsReadOnlyOnNonAccessorProperties(transitionKind)) {
</ins><span class="cx"> // We pin the property table on transitions that do wholesale editing of the property
</span><span class="cx"> // table, since our logic for walking the property transition chain to rematerialize the
</span><span class="cx"> // table doesn't know how to take into account such wholesale edits.
</span><span class="lines">@@ -668,8 +664,12 @@
</span><span class="cx"> transition->pinForCaching();
</span><span class="cx">
</span><span class="cx"> if (transition->propertyTable()) {
</span><del>- for (auto& entry : *transition->propertyTable().get())
- entry.attributes |= additionalPropertyAttributes;
</del><ins>+ for (auto& entry : *transition->propertyTable().get()) {
+ if (setsDontDeleteOnAllProperties(transitionKind))
+ entry.attributes |= DontDelete;
+ if (setsReadOnlyOnNonAccessorProperties(transitionKind) && !(entry.attributes & Accessor))
+ entry.attributes |= ReadOnly;
+ }
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> transition->propertyTable().set(vm, transition, structure->takePropertyTableOrCloneIfPinned(vm));
</span><span class="lines">@@ -677,7 +677,7 @@
</span><span class="cx"> checkOffset(transition->m_offset, transition->inlineCapacity());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (setsReadOnlyOnAllProperties(transitionKind)
</del><ins>+ if (setsReadOnlyOnNonAccessorProperties(transitionKind)
</ins><span class="cx"> && transition->propertyTable()
</span><span class="cx"> && !transition->propertyTable()->isEmpty())
</span><span class="cx"> transition->setHasReadOnlyOrGetterSetterPropertiesExcludingProto(true);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructureTransitionTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StructureTransitionTable.h (204092 => 204093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StructureTransitionTable.h 2016-08-03 18:44:04 UTC (rev 204092)
+++ trunk/Source/JavaScriptCore/runtime/StructureTransitionTable.h 2016-08-03 18:50:57 UTC (rev 204093)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool setsReadOnlyOnAllProperties(NonPropertyTransition transition)
</del><ins>+inline bool setsReadOnlyOnNonAccessorProperties(NonPropertyTransition transition)
</ins><span class="cx"> {
</span><span class="cx"> switch (transition) {
</span><span class="cx"> case NonPropertyTransition::Freeze:
</span></span></pre>
</div>
</div>
</body>
</html>