<!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>[197042] 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/197042">197042</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-02-24 12:43:21 -0800 (Wed, 24 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ES6] Implement Proxy.[[Delete]]
https://bugs.webkit.org/show_bug.cgi?id=154607
Reviewed by Mark Lam.
This patch implements Proxy.[[Delete]] with respect to section 9.5.10 of the ECMAScript spec.
https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-delete-p
* runtime/ProxyObject.cpp:
(JSC::ProxyObject::getConstructData):
(JSC::ProxyObject::performDelete):
(JSC::ProxyObject::deleteProperty):
(JSC::ProxyObject::deletePropertyByIndex):
* runtime/ProxyObject.h:
* tests/es6.yaml:
* tests/stress/proxy-delete.js: Added.
(assert):
(throw.new.Error.let.handler.get deleteProperty):
(throw.new.Error):
(assert.let.handler.deleteProperty):
(let.handler.deleteProperty):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeProxyObjectcpp">trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeProxyObjecth">trunk/Source/JavaScriptCore/runtime/ProxyObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoretestses6yaml">trunk/Source/JavaScriptCore/tests/es6.yaml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressproxydeletejs">trunk/Source/JavaScriptCore/tests/stress/proxy-delete.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197041 => 197042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-24 20:31:40 UTC (rev 197041)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-24 20:43:21 UTC (rev 197042)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-02-24 Saam Barati <sbarati@apple.com>
+
+ [ES6] Implement Proxy.[[Delete]]
+ https://bugs.webkit.org/show_bug.cgi?id=154607
+
+ Reviewed by Mark Lam.
+
+ This patch implements Proxy.[[Delete]] with respect to section 9.5.10 of the ECMAScript spec.
+ https://tc39.github.io/ecma262/#sec-proxy-object-internal-methods-and-internal-slots-delete-p
+
+ * runtime/ProxyObject.cpp:
+ (JSC::ProxyObject::getConstructData):
+ (JSC::ProxyObject::performDelete):
+ (JSC::ProxyObject::deleteProperty):
+ (JSC::ProxyObject::deletePropertyByIndex):
+ * runtime/ProxyObject.h:
+ * tests/es6.yaml:
+ * tests/stress/proxy-delete.js: Added.
+ (assert):
+ (throw.new.Error.let.handler.get deleteProperty):
+ (throw.new.Error):
+ (assert.let.handler.deleteProperty):
+ (let.handler.deleteProperty):
+
</ins><span class="cx"> 2016-02-24 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Stackmaps have problems with double register constraints
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp (197041 => 197042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-02-24 20:31:40 UTC (rev 197041)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-02-24 20:43:21 UTC (rev 197042)
</span><span class="lines">@@ -405,4 +405,75 @@
</span><span class="cx"> return ConstructTypeHost;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template <typename DefaultDeleteFunction>
+bool ProxyObject::performDelete(ExecState* exec, PropertyName propertyName, DefaultDeleteFunction defaultDeleteFunction)
+{
+ VM& vm = exec->vm();
+ JSValue handlerValue = this->handler();
+ if (handlerValue.isNull()) {
+ throwVMTypeError(exec, ASCIILiteral("Proxy 'handler' is null. It should be an Object."));
+ return false;
+ }
+
+ JSObject* handler = jsCast<JSObject*>(handlerValue);
+ CallData callData;
+ CallType callType;
+ JSValue deletePropertyMethod = handler->getMethod(exec, callData, callType, makeIdentifier(vm, "deleteProperty"), ASCIILiteral("'deleteProperty' property of a Proxy's handler should be callable."));
+ if (exec->hadException())
+ return false;
+ JSObject* target = this->target();
+ if (deletePropertyMethod.isUndefined())
+ return defaultDeleteFunction();
+
+ MarkedArgumentBuffer arguments;
+ arguments.append(target);
+ arguments.append(identifierToSafePublicJSValue(vm, Identifier::fromUid(&vm, propertyName.uid())));
+ JSValue trapResult = call(exec, deletePropertyMethod, callType, callData, handler, arguments);
+ if (exec->hadException())
+ return false;
+
+ bool trapResultAsBool = trapResult.toBoolean(exec);
+ if (exec->hadException())
+ return false;
+
+ if (!trapResultAsBool)
+ return false;
+
+ PropertyDescriptor descriptor;
+ if (target->getOwnPropertyDescriptor(exec, propertyName, descriptor)) {
+ if (!descriptor.configurable()) {
+ throwVMTypeError(exec, ASCIILiteral("Proxy handler's 'deleteProperty' method should return false when the target's property is not configurable."));
+ return false;
+ }
+ }
+
+ if (exec->hadException())
+ return false;
+
+ return true;
+}
+
+bool ProxyObject::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName)
+{
+ ProxyObject* thisObject = jsCast<ProxyObject*>(cell);
+ auto defaultDelete = [&] () -> bool {
+ JSObject* target = jsCast<JSObject*>(thisObject->target());
+ return target->methodTable(exec->vm())->deleteProperty(target, exec, propertyName);
+ };
+ return thisObject->performDelete(exec, propertyName, defaultDelete);
+}
+
+bool ProxyObject::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned propertyName)
+{
+ ProxyObject* thisObject = jsCast<ProxyObject*>(cell);
+ Identifier ident = Identifier::from(exec, propertyName);
+ if (exec->hadException())
+ return false;
+ auto defaultDelete = [&] () -> bool {
+ JSObject* target = jsCast<JSObject*>(thisObject->target());
+ return target->methodTable(exec->vm())->deletePropertyByIndex(target, exec, propertyName);
+ };
+ return thisObject->performDelete(exec, ident.impl(), defaultDelete);
+}
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.h (197041 => 197042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.h 2016-02-24 20:31:40 UTC (rev 197041)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.h 2016-02-24 20:43:21 UTC (rev 197042)
</span><span class="lines">@@ -63,11 +63,15 @@
</span><span class="cx"> static bool getOwnPropertySlotByIndex(JSObject*, ExecState*, unsigned propertyName, PropertySlot&);
</span><span class="cx"> static CallType getCallData(JSCell*, CallData&);
</span><span class="cx"> static ConstructType getConstructData(JSCell*, ConstructData&);
</span><ins>+ static bool deleteProperty(JSCell*, ExecState*, PropertyName);
+ static bool deletePropertyByIndex(JSCell*, ExecState*, unsigned propertyName);
</ins><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><span class="cx"> bool getOwnPropertySlotCommon(ExecState*, PropertyName, PropertySlot&);
</span><span class="cx"> bool performInternalMethodGetOwnProperty(ExecState*, PropertyName, PropertySlot&);
</span><span class="cx"> bool performHasProperty(ExecState*, PropertyName, PropertySlot&);
</span><ins>+ template <typename DefaultDeleteFunction>
+ bool performDelete(ExecState*, PropertyName, DefaultDeleteFunction);
</ins><span class="cx">
</span><span class="cx"> WriteBarrier<JSObject> m_target;
</span><span class="cx"> WriteBarrier<Unknown> m_handler;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6.yaml (197041 => 197042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml 2016-02-24 20:31:40 UTC (rev 197041)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml 2016-02-24 20:43:21 UTC (rev 197042)
</span><span class="lines">@@ -917,7 +917,7 @@
</span><span class="cx"> - path: es6/Proxy_defineProperty_handler.js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/Proxy_deleteProperty_handler.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_enumerate_handler.js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/Proxy_get_handler.js
</span><span class="lines">@@ -937,9 +937,9 @@
</span><span class="cx"> - path: es6/Proxy_internal_defineProperty_calls_SetIntegrityLevel.js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/Proxy_internal_deleteProperty_calls_Array.prototype.copyWithin.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_internal_deleteProperty_calls_Array.prototype.pop.js
</span><del>- cmd: runES6 :fail
</del><ins>+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_internal_deleteProperty_calls_Array.prototype.reverse.js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/Proxy_internal_deleteProperty_calls_Array.prototype.shift.js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressproxydeletejs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/proxy-delete.js (0 => 197042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/proxy-delete.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/proxy-delete.js 2016-02-24 20:43:21 UTC (rev 197042)
</span><span class="lines">@@ -0,0 +1,277 @@
</span><ins>+function assert(b) {
+ if (!b)
+ throw new Error("bad assertion.");
+}
+
+{
+ let target = {x: 20};
+ let error = null;
+ let handler = {
+ get deleteProperty() {
+ error = new Error;
+ throw error;
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ delete proxy.x;
+ } catch(e) {
+ assert(e === error);
+ threw = true;
+ }
+ assert(threw);
+ }
+}
+
+{
+ let target = {x: 20};
+ let error = null;
+ let handler = {
+ deleteProperty: function() {
+ error = new Error;
+ throw error;
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ delete proxy.x;
+ } catch(e) {
+ assert(e === error);
+ threw = true;
+ }
+ assert(threw);
+ }
+}
+
+{
+ let target = {x: 20};
+ let error = null;
+ let handler = {
+ deleteProperty: 45
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ delete proxy.x;
+ } catch(e) {
+ assert(e.toString() === "TypeError: 'deleteProperty' property of a Proxy's handler should be callable.");
+ threw = true;
+ }
+ assert(threw);
+ }
+}
+
+{
+ let target = {};
+ Object.defineProperty(target, "x", {
+ configurable: false,
+ value: 25
+ });
+ let error = null;
+ let handler = {
+ deleteProperty: function(theTarget, propName) {
+ delete theTarget[propName];
+ return true;
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let threw = false;
+ try {
+ delete proxy.x;
+ } catch(e) {
+ assert(e.toString() === "TypeError: Proxy handler's 'deleteProperty' method should return false when the target's property is not configurable.");
+ threw = true;
+ }
+ assert(threw);
+ }
+}
+
+{
+ let target = {};
+ let error = null;
+ let handler = {
+ deleteProperty: null
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ target.x = i;
+ assert(proxy.x === i);
+ let result = delete proxy.x;
+ assert(result);
+ assert(proxy.x === undefined);
+ }
+}
+
+{
+ let target = {};
+ let error = null;
+ let handler = {
+ deleteProperty: undefined
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ target[i] = i;
+ assert(proxy[i] === i);
+ let result = delete proxy[i];
+ assert(result);
+ assert(proxy[i] === undefined);
+ }
+}
+
+{
+ let target = {};
+ let called = false;
+ let handler = {
+ deleteProperty: function(theTarget, propName) {
+ called = true;
+ assert(theTarget === target);
+ assert(propName === "x");
+ return delete theTarget[propName];
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ target.x = i;
+ assert(proxy.x === i);
+ let result = delete proxy.x;
+ assert(result);
+ assert(proxy.x === undefined);
+ assert(target.x === undefined);
+ assert(called);
+ called = false;
+ }
+}
+
+{
+ let target = {};
+ let called = false;
+ let handler = {
+ deleteProperty: function(theTarget, propName) {
+ called = true;
+ assert(theTarget === target);
+ assert(propName === "x");
+ return delete theTarget[propName];
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ target.x = i;
+ assert(proxy.x === i);
+ let result = delete proxy["x"];
+ assert(result);
+ assert(proxy.x === undefined);
+ assert(target.x === undefined);
+ assert(called);
+ called = false;
+ }
+}
+
+{
+ let target = {};
+ let called = false;
+ let handler = {
+ deleteProperty: function(theTarget, propName) {
+ called = true;
+ assert(theTarget === target);
+ return delete theTarget[propName];
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ target[i] = i;
+ assert(proxy[i] === i);
+ let result = delete proxy[i];
+ assert(result);
+ assert(proxy[i] === undefined);
+ assert(target[i] === undefined);
+ assert(called);
+ called = false;
+ }
+}
+
+{
+ let target = {};
+ let called = false;
+ let handler = {
+ deleteProperty: function(theTarget, propName) {
+ called = true;
+ assert(theTarget === target);
+ delete theTarget[propName];
+ return false; // We're liars.
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ target[i] = i;
+ assert(proxy[i] === i);
+ let result = delete proxy[i];
+ assert(!result);
+ assert(proxy[i] === undefined);
+ assert(target[i] === undefined);
+ assert(called);
+ called = false;
+ }
+}
+
+{
+ let target = {};
+ let error = null;
+ let called = false;
+ let handler = {
+ deleteProperty: function(theTarget, propName) {
+ called = true;
+ return delete theTarget[propName];
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ Object.defineProperty(target, "x", {
+ configurable: true,
+ writable: false,
+ value: 25
+ });
+ target.x = 30;
+ assert(target.x === 25);
+ assert(proxy.x === 25);
+ delete proxy.x;
+ assert(target.x === undefined);
+ assert(proxy.x === undefined);
+ assert(!("x" in proxy));
+ assert(!("x" in target));
+ assert(called);
+ called = false;
+ }
+}
+
+{
+ let target = {};
+ let error = null;
+ Object.defineProperty(target, "x", {
+ configurable: false,
+ writable: false,
+ value: 25
+ });
+ let called = false;
+ let handler = {
+ deleteProperty: function(theTarget, propName) {
+ called = true;
+ return delete theTarget[propName];
+ }
+ };
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ target.x = 30;
+ assert(target.x === 25);
+ assert(proxy.x === 25);
+ let result = delete proxy.x;
+ assert(!result);
+ assert(called);
+ called = false;
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>