<!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>[246346] 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/246346">246346</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2019-06-11 20:18:53 -0700 (Tue, 11 Jun 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>JSC should throw if proxy set returns falsish in strict mode context
https://bugs.webkit.org/show_bug.cgi?id=177398

Patch by Alexey Shvayka <shvaikalesh@gmail.com> on 2019-06-11
Reviewed by Yusuke Suzuki.

JSTests:

1. Add coverage for Proxy `set` trap returning falsy value in strict mode.
2. RegExp methods throw unless [[Set]] succeeds. Return `true` from Proxy `set` traps to fix the tests.

* stress/proxy-set.js: Add 2 test cases.
* stress/regexp-match-proxy.js: Fix test.
* stress/regexp-replace-proxy.js: Fix test.

Source/JavaScriptCore:

Throw TypeError exception if Proxy's `set` trap returns falsy value.
(step 6.c of https://tc39.es/ecma262/#sec-putvalue)

* runtime/ProxyObject.cpp:
(JSC::ProxyObject::performPut):
(JSC::ProxyObject::put):
(JSC::ProxyObject::putByIndexCommon):
* runtime/ProxyObject.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestsstressproxysetjs">trunk/JSTests/stress/proxy-set.js</a></li>
<li><a href="#trunkJSTestsstressregexpmatchproxyjs">trunk/JSTests/stress/regexp-match-proxy.js</a></li>
<li><a href="#trunkJSTestsstressregexpreplaceproxyjs">trunk/JSTests/stress/regexp-replace-proxy.js</a></li>
<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>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (246345 => 246346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog  2019-06-12 03:18:25 UTC (rev 246345)
+++ trunk/JSTests/ChangeLog     2019-06-12 03:18:53 UTC (rev 246346)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2019-06-11  Alexey Shvayka  <shvaikalesh@gmail.com>
</span><span class="cx"> 
</span><ins>+        JSC should throw if proxy set returns falsish in strict mode context
+        https://bugs.webkit.org/show_bug.cgi?id=177398
+
+        Reviewed by Yusuke Suzuki.
+
+        1. Add coverage for Proxy `set` trap returning falsy value in strict mode.
+        2. RegExp methods throw unless [[Set]] succeeds. Return `true` from Proxy `set` traps to fix the tests.
+
+        * stress/proxy-set.js: Add 2 test cases.
+        * stress/regexp-match-proxy.js: Fix test.
+        * stress/regexp-replace-proxy.js: Fix test.
+
+2019-06-11  Alexey Shvayka  <shvaikalesh@gmail.com>
+
</ins><span class="cx">         Error message for non-callable Proxy `construct` trap is misleading
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=198637
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJSTestsstressproxysetjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/stress/proxy-set.js (246345 => 246346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/proxy-set.js        2019-06-12 03:18:25 UTC (rev 246345)
+++ trunk/JSTests/stress/proxy-set.js   2019-06-12 03:18:53 UTC (rev 246346)
</span><span class="lines">@@ -80,6 +80,56 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+(function() {
+    "use strict";
+    let target = {
+        x: 30
+    };
+
+    let handler = {
+        set: function() {
+            return false;
+        }
+    };
+
+    let proxy = new Proxy(target, handler);
+    for (let i = 0; i < 1000; i++) {
+        let threw = false;
+        try {
+            proxy.x = 40;
+        } catch(e) {
+            assert(e.toString() === "TypeError: Proxy object's 'set' trap returned falsy value for property 'x'");
+            threw = true;
+        }
+        assert(threw);
+    }
+})();
+
+(function() {
+    "use strict";
+    let target = {
+        x: 30
+    };
+
+    let handler = {
+        set: function() {
+            return false;
+        }
+    };
+
+    let proxy = new Proxy(target, handler);
+    for (let i = 0; i < 1000; i++) {
+        let threw = false;
+        try {
+            proxy[42] = 40;
+        } catch(e) {
+            assert(e.toString() === "TypeError: Proxy object's 'set' trap returned falsy value for property '42'");
+            threw = true;
+        }
+        assert(threw);
+    }
+})();
+
</ins><span class="cx"> {
</span><span class="cx">     let target = { };
</span><span class="cx">     Object.defineProperty(target, "x", {
</span></span></pre></div>
<a id="trunkJSTestsstressregexpmatchproxyjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/stress/regexp-match-proxy.js (246345 => 246346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/regexp-match-proxy.js       2019-06-12 03:18:25 UTC (rev 246345)
+++ trunk/JSTests/stress/regexp-match-proxy.js  2019-06-12 03:18:53 UTC (rev 246346)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx">             set.push(k);
</span><span class="cx">             getSet.push(k);
</span><span class="cx">             o[k] = v;
</span><ins>+            return true;
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span><span class="lines">@@ -83,6 +84,7 @@
</span><span class="cx">             set.push(k);
</span><span class="cx">             getSet.push(k);
</span><span class="cx">             o[k] = v;
</span><ins>+            return true;
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span><span class="lines">@@ -117,6 +119,7 @@
</span><span class="cx">             if (k.toString() == "lastIndex")
</span><span class="cx">                 regExpGlobal_tx_Greedy.lastIndex = v;
</span><span class="cx">             o[k] = v;
</span><ins>+            return true;
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span><span class="lines">@@ -152,6 +155,7 @@
</span><span class="cx">             if (k.toString() == "lastIndex")
</span><span class="cx">                 regExpGlobalUnicode_digit_nonGreedy.lastIndex = v;
</span><span class="cx">             o[k] = v;
</span><ins>+            return true;
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJSTestsstressregexpreplaceproxyjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/stress/regexp-replace-proxy.js (246345 => 246346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/regexp-replace-proxy.js     2019-06-12 03:18:25 UTC (rev 246345)
+++ trunk/JSTests/stress/regexp-replace-proxy.js        2019-06-12 03:18:53 UTC (rev 246346)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx">         {
</span><span class="cx">             getSet.push(k);
</span><span class="cx">             o[k] = v;
</span><ins>+            return true;
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span><span class="lines">@@ -78,6 +79,7 @@
</span><span class="cx">         {
</span><span class="cx">             getSet.push(k);
</span><span class="cx">             o[k] = v;
</span><ins>+            return true;
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span><span class="lines">@@ -110,6 +112,7 @@
</span><span class="cx">             if (k.toString() == "lastIndex")
</span><span class="cx">                 regExp_phoneNumber.lastIndex = v;
</span><span class="cx">             o[k] = v;
</span><ins>+            return true;
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span><span class="lines">@@ -141,6 +144,7 @@
</span><span class="cx">             if (k.toString() == "lastIndex")
</span><span class="cx">                 regExpGlobalUnicode_digit_nonGreedy.lastIndex = v;
</span><span class="cx">             o[k] = v;
</span><ins>+            return true;
</ins><span class="cx">         }
</span><span class="cx">     });
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (246345 => 246346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2019-06-12 03:18:25 UTC (rev 246345)
+++ trunk/Source/JavaScriptCore/ChangeLog       2019-06-12 03:18:53 UTC (rev 246346)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2019-06-11  Alexey Shvayka  <shvaikalesh@gmail.com>
</span><span class="cx"> 
</span><ins>+        JSC should throw if proxy set returns falsish in strict mode context
+        https://bugs.webkit.org/show_bug.cgi?id=177398
+
+        Reviewed by Yusuke Suzuki.
+
+        Throw TypeError exception if Proxy's `set` trap returns falsy value.
+        (step 6.c of https://tc39.es/ecma262/#sec-putvalue)
+
+        * runtime/ProxyObject.cpp:
+        (JSC::ProxyObject::performPut):
+        (JSC::ProxyObject::put):
+        (JSC::ProxyObject::putByIndexCommon):
+        * runtime/ProxyObject.h:
+
+2019-06-11  Alexey Shvayka  <shvaikalesh@gmail.com>
+
</ins><span class="cx">         Error message for non-callable Proxy `construct` trap is misleading
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=198637
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp (246345 => 246346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp      2019-06-12 03:18:25 UTC (rev 246345)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2019-06-12 03:18:53 UTC (rev 246346)
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template <typename PerformDefaultPutFunction>
</span><del>-bool ProxyObject::performPut(ExecState* exec, JSValue putValue, JSValue thisValue, PropertyName propertyName, PerformDefaultPutFunction performDefaultPut)
</del><ins>+bool ProxyObject::performPut(ExecState* exec, JSValue putValue, JSValue thisValue, PropertyName propertyName, PerformDefaultPutFunction performDefaultPut, bool shouldThrow)
</ins><span class="cx"> {
</span><span class="cx">     NO_TAIL_CALLS();
</span><span class="cx"> 
</span><span class="lines">@@ -448,8 +448,11 @@
</span><span class="cx">     RETURN_IF_EXCEPTION(scope, false);
</span><span class="cx">     bool trapResultAsBool = trapResult.toBoolean(exec);
</span><span class="cx">     RETURN_IF_EXCEPTION(scope, false);
</span><del>-    if (!trapResultAsBool)
</del><ins>+    if (!trapResultAsBool) {
+        if (shouldThrow)
+            throwVMTypeError(exec, scope, makeString("Proxy object's 'set' trap returned falsy value for property '", String(propertyName.uid()), "'"));
</ins><span class="cx">         return false;
</span><ins>+    }
</ins><span class="cx"> 
</span><span class="cx">     PropertyDescriptor descriptor;
</span><span class="cx">     bool hasProperty = target->getOwnPropertyDescriptor(exec, propertyName, descriptor);
</span><span class="lines">@@ -478,7 +481,7 @@
</span><span class="cx">         JSObject* target = jsCast<JSObject*>(thisObject->target());
</span><span class="cx">         return target->methodTable(vm)->put(target, exec, propertyName, value, slot);
</span><span class="cx">     };
</span><del>-    return thisObject->performPut(exec, value, slot.thisValue(), propertyName, performDefaultPut);
</del><ins>+    return thisObject->performPut(exec, value, slot.thisValue(), propertyName, performDefaultPut, slot.isStrictMode());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool ProxyObject::putByIndexCommon(ExecState* exec, JSValue thisValue, unsigned propertyName, JSValue putValue, bool shouldThrow)
</span><span class="lines">@@ -493,7 +496,7 @@
</span><span class="cx">         PutPropertySlot slot(thisValue, isStrictMode); // We must preserve the "this" target of the putByIndex.
</span><span class="cx">         return target->methodTable(vm)->put(target, exec, ident.impl(), putValue, slot);
</span><span class="cx">     };
</span><del>-    RELEASE_AND_RETURN(scope, performPut(exec, putValue, thisValue, ident.impl(), performDefaultPut));
</del><ins>+    RELEASE_AND_RETURN(scope, performPut(exec, putValue, thisValue, ident.impl(), performDefaultPut, shouldThrow));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool ProxyObject::putByIndex(JSCell* cell, ExecState* exec, unsigned propertyName, JSValue value, bool shouldThrow)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.h (246345 => 246346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.h        2019-06-12 03:18:25 UTC (rev 246345)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.h   2019-06-12 03:18:53 UTC (rev 246346)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">     template <typename DefaultDeleteFunction>
</span><span class="cx">     bool performDelete(ExecState*, PropertyName, DefaultDeleteFunction);
</span><span class="cx">     template <typename PerformDefaultPutFunction>
</span><del>-    bool performPut(ExecState*, JSValue putValue, JSValue thisValue, PropertyName, PerformDefaultPutFunction);
</del><ins>+    bool performPut(ExecState*, JSValue putValue, JSValue thisValue, PropertyName, PerformDefaultPutFunction, bool shouldThrow);
</ins><span class="cx">     bool performPreventExtensions(ExecState*);
</span><span class="cx">     bool performIsExtensible(ExecState*);
</span><span class="cx">     bool performDefineOwnProperty(ExecState*, PropertyName, const PropertyDescriptor&, bool shouldThrow);
</span></span></pre>
</div>
</div>

</body>
</html>