<!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>[206948] 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/206948">206948</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-10-07 20:20:53 -0700 (Fri, 07 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Object.freeze() and seal() should throw if [[PreventExtensions]]() fails.
https://bugs.webkit.org/show_bug.cgi?id=163160
Reviewed by Saam Barati.
JSTests:
* stress/object-freeze-with-proxy-preventExtensions.js: Added.
* stress/object-seal-with-proxy-preventExtensions.js: Added.
Source/JavaScriptCore:
See https://tc39.github.io/ecma262/#sec-object.freeze,
https://tc39.github.io/ecma262/#sec-object.seal, and
https://tc39.github.io/ecma262/#sec-setintegritylevel. We need to call
preventExtensions first before proceeding to freeze / seal the object. If
preventExtensions fails, we should throw a TypeError.
* runtime/ObjectConstructor.cpp:
(JSC::setIntegrityLevel):
(JSC::objectConstructorSeal):
(JSC::objectConstructorFreeze):</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="#trunkSourceJavaScriptCoreruntimeObjectConstructorcpp">trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressobjectfreezewithproxypreventExtensionsjs">trunk/JSTests/stress/object-freeze-with-proxy-preventExtensions.js</a></li>
<li><a href="#trunkJSTestsstressobjectsealwithproxypreventExtensionsjs">trunk/JSTests/stress/object-seal-with-proxy-preventExtensions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (206947 => 206948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-10-08 02:07:09 UTC (rev 206947)
+++ trunk/JSTests/ChangeLog 2016-10-08 03:20:53 UTC (rev 206948)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-07 Mark Lam <mark.lam@apple.com>
+
+ Object.freeze() and seal() should throw if [[PreventExtensions]]() fails.
+ https://bugs.webkit.org/show_bug.cgi?id=163160
+
+ Reviewed by Saam Barati.
+
+ * stress/object-freeze-with-proxy-preventExtensions.js: Added.
+ * stress/object-seal-with-proxy-preventExtensions.js: Added.
+
</ins><span class="cx"> 2016-10-05 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [DOMJIT] Add initial CheckDOM and CallDOM implementations
</span></span></pre></div>
<a id="trunkJSTestsstressobjectfreezewithproxypreventExtensionsjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/object-freeze-with-proxy-preventExtensions.js (0 => 206948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/object-freeze-with-proxy-preventExtensions.js (rev 0)
+++ trunk/JSTests/stress/object-freeze-with-proxy-preventExtensions.js 2016-10-08 03:20:53 UTC (rev 206948)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+// See https://tc39.github.io/ecma262/#sec-object.freeze
+// See https://tc39.github.io/ecma262/#sec-setintegritylevel
+
+var x = [10];
+var visited = [];
+
+var proxy = new Proxy(x, {
+ preventExtensions() {
+ visited.push("proxy_preventExtensions");
+ return false;
+ }
+});
+
+var exception;
+try {
+ visited.push("before_freeze");
+ Object.freeze(proxy);
+ visited.push("after_freeze");
+} catch (e) {
+ visited.push("catch");
+ exception = e;
+}
+
+var exceptionStr = "" + exception;
+if (!exceptionStr.startsWith("TypeError:"))
+ throw "Did not throw expected TypeError";
+
+if (visited != "before_freeze,proxy_preventExtensions,catch")
+ throw "ERROR: visited = " + visited;
</ins></span></pre></div>
<a id="trunkJSTestsstressobjectsealwithproxypreventExtensionsjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/object-seal-with-proxy-preventExtensions.js (0 => 206948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/object-seal-with-proxy-preventExtensions.js (rev 0)
+++ trunk/JSTests/stress/object-seal-with-proxy-preventExtensions.js 2016-10-08 03:20:53 UTC (rev 206948)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+// See https://tc39.github.io/ecma262/#sec-object.seal
+// See https://tc39.github.io/ecma262/#sec-setintegritylevel
+
+var x = [10];
+var visited = [];
+
+var proxy = new Proxy(x, {
+ preventExtensions() {
+ visited.push("proxy_preventExtensions");
+ return false;
+ }
+});
+
+var exception;
+try {
+ visited.push("before_seal");
+ Object.seal(proxy);
+ visited.push("after_seal");
+} catch (e) {
+ visited.push("catch");
+ exception = e;
+}
+
+var exceptionStr = "" + exception;
+if (!exceptionStr.startsWith("TypeError:"))
+ throw "Did not throw expected TypeError";
+
+if (visited != "before_seal,proxy_preventExtensions,catch")
+ throw "ERROR: visited = " + visited;
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (206947 => 206948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-08 02:07:09 UTC (rev 206947)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-08 03:20:53 UTC (rev 206948)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-10-07 Mark Lam <mark.lam@apple.com>
+
+ Object.freeze() and seal() should throw if [[PreventExtensions]]() fails.
+ https://bugs.webkit.org/show_bug.cgi?id=163160
+
+ Reviewed by Saam Barati.
+
+ See https://tc39.github.io/ecma262/#sec-object.freeze,
+ https://tc39.github.io/ecma262/#sec-object.seal, and
+ https://tc39.github.io/ecma262/#sec-setintegritylevel. We need to call
+ preventExtensions first before proceeding to freeze / seal the object. If
+ preventExtensions fails, we should throw a TypeError.
+
+ * runtime/ObjectConstructor.cpp:
+ (JSC::setIntegrityLevel):
+ (JSC::objectConstructorSeal):
+ (JSC::objectConstructorFreeze):
+
</ins><span class="cx"> 2016-10-06 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [DOMJIT] Support slow path call
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp (206947 => 206948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2016-10-08 02:07:09 UTC (rev 206947)
+++ trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2016-10-08 03:20:53 UTC (rev 206948)
</span><span class="lines">@@ -471,6 +471,51 @@
</span><span class="cx"> return JSValue::encode(defineProperties(exec, newObject, asObject(exec->argument(1))));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+enum class IntegrityLevel {
+ Sealed,
+ Frozen
+};
+
+template<IntegrityLevel level>
+bool setIntegrityLevel(ExecState* exec, VM& vm, JSObject* object)
+{
+ // See https://tc39.github.io/ecma262/#sec-setintegritylevel.
+ auto scope = DECLARE_THROW_SCOPE(vm);
+
+ bool success = object->methodTable(vm)->preventExtensions(object, exec);
+ RETURN_IF_EXCEPTION(scope, false);
+ if (UNLIKELY(!success))
+ return false;
+
+ PropertyNameArray properties(exec, PropertyNameMode::StringsAndSymbols);
+ object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
+ RETURN_IF_EXCEPTION(scope, false);
+
+ PropertyNameArray::const_iterator end = properties.end();
+ for (PropertyNameArray::const_iterator iter = properties.begin(); iter != end; ++iter) {
+ Identifier propertyName = *iter;
+ if (vm.propertyNames->isPrivateName(propertyName))
+ continue;
+
+ PropertyDescriptor desc;
+ if (level == IntegrityLevel::Sealed)
+ desc.setConfigurable(false);
+ else {
+ if (!object->getOwnPropertyDescriptor(exec, propertyName, desc))
+ continue;
+
+ if (desc.isDataDescriptor())
+ desc.setWritable(false);
+
+ desc.setConfigurable(false);
+ }
+
+ object->methodTable(vm)->defineOwnProperty(object, exec, propertyName, desc, true);
+ RETURN_IF_EXCEPTION(scope, false);
+ }
+ return true;
+}
+
</ins><span class="cx"> EncodedJSValue JSC_HOST_CALL objectConstructorSeal(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="lines">@@ -487,31 +532,13 @@
</span><span class="cx"> return JSValue::encode(obj);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // 2. For each named own property name P of O,
- PropertyNameArray properties(exec, PropertyNameMode::StringsAndSymbols);
- object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
</del><ins>+ bool success = setIntegrityLevel<IntegrityLevel::Sealed>(exec, vm, object);
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><del>- PropertyNameArray::const_iterator end = properties.end();
- for (PropertyNameArray::const_iterator iter = properties.begin(); iter != end; ++iter) {
- Identifier propertyName = *iter;
- if (exec->propertyNames().isPrivateName(propertyName))
- continue;
- // a. Let desc be the result of calling the [[GetOwnProperty]] internal method of O with P.
- PropertyDescriptor desc;
- if (!object->getOwnPropertyDescriptor(exec, propertyName, desc))
- continue;
- // b. If desc.[[Configurable]] is true, set desc.[[Configurable]] to false.
- desc.setConfigurable(false);
- // c. Call the [[DefineOwnProperty]] internal method of O with P, desc, and true as arguments.
- object->methodTable(vm)->defineOwnProperty(object, exec, propertyName, desc, true);
- RETURN_IF_EXCEPTION(scope, encodedJSValue());
</del><ins>+ if (!success) {
+ throwTypeError(exec, scope, ASCIILiteral("Unable to prevent extension in Object.seal"));
+ return encodedJSValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // 3. Set the [[Extensible]] internal property of O to false.
- object->methodTable(vm)->preventExtensions(object, exec);
- RETURN_IF_EXCEPTION(scope, encodedJSValue());
-
- // 4. Return O.
</del><span class="cx"> return JSValue::encode(obj);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -525,35 +552,10 @@
</span><span class="cx"> return object;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // 2. For each named own property name P of O,
- PropertyNameArray properties(exec, PropertyNameMode::StringsAndSymbols);
- object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
</del><ins>+ bool success = setIntegrityLevel<IntegrityLevel::Frozen>(exec, vm, object);
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, nullptr);
</span><del>- PropertyNameArray::const_iterator end = properties.end();
- for (PropertyNameArray::const_iterator iter = properties.begin(); iter != end; ++iter) {
- Identifier propertyName = *iter;
- if (exec->propertyNames().isPrivateName(propertyName))
- continue;
- // a. Let desc be the result of calling the [[GetOwnProperty]] internal method of O with P.
- PropertyDescriptor desc;
- if (!object->getOwnPropertyDescriptor(exec, propertyName, desc))
- continue;
- // b. If IsDataDescriptor(desc) is true, then
- // i. If desc.[[Writable]] is true, set desc.[[Writable]] to false.
- if (desc.isDataDescriptor())
- desc.setWritable(false);
- // c. If desc.[[Configurable]] is true, set desc.[[Configurable]] to false.
- desc.setConfigurable(false);
- // d. Call the [[DefineOwnProperty]] internal method of O with P, desc, and true as arguments.
- object->methodTable(vm)->defineOwnProperty(object, exec, propertyName, desc, true);
- RETURN_IF_EXCEPTION(scope, nullptr);
- }
-
- // 3. Set the [[Extensible]] internal property of O to false.
- object->methodTable(vm)->preventExtensions(object, exec);
- RETURN_IF_EXCEPTION(scope, nullptr);
-
- // 4. Return O.
</del><ins>+ if (!success)
+ return throwTypeError(exec, scope, ASCIILiteral("Unable to prevent extension in Object.freeze"));
</ins><span class="cx"> return object;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>