<!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>[197999] 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/197999">197999</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-03-10 23:10:18 -0800 (Thu, 10 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ES6] Make RegExp.prototype.toString spec compliant
https://bugs.webkit.org/show_bug.cgi?id=155341
Reviewed by Filip Pizlo.
Before we were directly calling into the flagsString
function. Instead, we must get the "flags" property
of the thisObject. This will usually call into the flags
getter, but not always. Specifically, you can you a Proxy
to observe this behavior.
* runtime/RegExpPrototype.cpp:
(JSC::regExpProtoFuncToString):
(JSC::regExpProtoGetterGlobal):
* tests/es6.yaml:
* tests/es6/Proxy_internal_get_calls_RegExp.prototype.toString.js: Added.
(test.get var):
(test.):
* tests/stress/regexp-prototype-tostring.js: Added.
(assert):
(test):
(test.get var):
(test.):
(let.handler.get switch):
(let.handler):
(get test):
(test.get RegExp):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregexptoStringexpectedtxt">trunk/LayoutTests/js/regexp-toString-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsregexptoStringjs">trunk/LayoutTests/js/script-tests/regexp-toString.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpPrototypecpp">trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestses6yaml">trunk/Source/JavaScriptCore/tests/es6.yaml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestses6Proxy_internal_get_calls_RegExpprototypetoStringjs">trunk/Source/JavaScriptCore/tests/es6/Proxy_internal_get_calls_RegExp.prototype.toString.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressregexpprototypetostringjs">trunk/Source/JavaScriptCore/tests/stress/regexp-prototype-tostring.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsjsregexptoStringexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/regexp-toString-expected.txt (197998 => 197999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regexp-toString-expected.txt 2016-03-11 07:05:01 UTC (rev 197998)
+++ trunk/LayoutTests/js/regexp-toString-expected.txt 2016-03-11 07:10:18 UTC (rev 197999)
</span><span class="lines">@@ -11,11 +11,11 @@
</span><span class="cx"> PASS RegExp.prototype.toString.call(new RegExp) is '/(?:)/'
</span><span class="cx"> PASS RegExp.prototype.toString.call(new RegExp('a')) is '/a/'
</span><span class="cx"> PASS RegExp.prototype.toString.call(new RegExp('\\\\')) is '/\\\\/'
</span><del>-PASS RegExp.prototype.toString.call({}) is '/undefined/'
-PASS RegExp.prototype.toString.call({source: 'hi'}) is '/hi/'
-PASS RegExp.prototype.toString.call({ __proto__: { source: 'yo' } }) is '/yo/'
-PASS RegExp.prototype.toString.call({source: ''}) is '//'
-PASS RegExp.prototype.toString.call({source: '/'}) is '///'
</del><ins>+PASS RegExp.prototype.toString.call({}) is '/undefined/undefined'
+PASS RegExp.prototype.toString.call({source: 'hi'}) is '/hi/undefined'
+PASS RegExp.prototype.toString.call({ __proto__: { source: 'yo' } }) is '/yo/undefined'
+PASS RegExp.prototype.toString.call({source: ''}) is '//undefined'
+PASS RegExp.prototype.toString.call({source: '/'}) is '///undefined'
</ins><span class="cx"> PASS RegExp.prototype.toString.call(undefined) threw exception TypeError: Type error.
</span><span class="cx"> PASS RegExp.prototype.toString.call(null) threw exception TypeError: Type error.
</span><span class="cx"> PASS RegExp.prototype.toString.call(false) threw exception TypeError: Type error.
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsregexptoStringjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/regexp-toString.js (197998 => 197999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/regexp-toString.js 2016-03-11 07:05:01 UTC (rev 197998)
+++ trunk/LayoutTests/js/script-tests/regexp-toString.js 2016-03-11 07:10:18 UTC (rev 197999)
</span><span class="lines">@@ -10,11 +10,11 @@
</span><span class="cx"> shouldBe("RegExp.prototype.toString.call(new RegExp('a'))", "'/a/'");
</span><span class="cx"> shouldBe("RegExp.prototype.toString.call(new RegExp('\\\\\\\\'))", "'/\\\\\\\\/'");
</span><span class="cx">
</span><del>-shouldBe("RegExp.prototype.toString.call({})", "'/undefined/'");
-shouldBe("RegExp.prototype.toString.call({source: 'hi'})", "'/hi/'");
-shouldBe("RegExp.prototype.toString.call({ __proto__: { source: 'yo' } })", "'/yo/'");
-shouldBe("RegExp.prototype.toString.call({source: ''})", "'//'");
-shouldBe("RegExp.prototype.toString.call({source: '/'})", "'///'");
</del><ins>+shouldBe("RegExp.prototype.toString.call({})", "'/undefined/undefined'");
+shouldBe("RegExp.prototype.toString.call({source: 'hi'})", "'/hi/undefined'");
+shouldBe("RegExp.prototype.toString.call({ __proto__: { source: 'yo' } })", "'/yo/undefined'");
+shouldBe("RegExp.prototype.toString.call({source: ''})", "'//undefined'");
+shouldBe("RegExp.prototype.toString.call({source: '/'})", "'///undefined'");
</ins><span class="cx">
</span><span class="cx"> shouldThrow("RegExp.prototype.toString.call(undefined)");
</span><span class="cx"> shouldThrow("RegExp.prototype.toString.call(null)");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197998 => 197999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-11 07:05:01 UTC (rev 197998)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-11 07:10:18 UTC (rev 197999)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-03-10 Saam barati <sbarati@apple.com>
+
+ [ES6] Make RegExp.prototype.toString spec compliant
+ https://bugs.webkit.org/show_bug.cgi?id=155341
+
+ Reviewed by Filip Pizlo.
+
+ Before we were directly calling into the flagsString
+ function. Instead, we must get the "flags" property
+ of the thisObject. This will usually call into the flags
+ getter, but not always. Specifically, you can you a Proxy
+ to observe this behavior.
+
+ * runtime/RegExpPrototype.cpp:
+ (JSC::regExpProtoFuncToString):
+ (JSC::regExpProtoGetterGlobal):
+ * tests/es6.yaml:
+ * tests/es6/Proxy_internal_get_calls_RegExp.prototype.toString.js: Added.
+ (test.get var):
+ (test.):
+ * tests/stress/regexp-prototype-tostring.js: Added.
+ (assert):
+ (test):
+ (test.get var):
+ (test.):
+ (let.handler.get switch):
+ (let.handler):
+ (get test):
+ (test.get RegExp):
+
</ins><span class="cx"> 2016-03-10 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Add register reuse for ArithAdd of an Int32 and constant in DFG
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp (197998 => 197999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp 2016-03-11 07:05:01 UTC (rev 197998)
+++ trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp 2016-03-11 07:10:18 UTC (rev 197999)
</span><span class="lines">@@ -208,18 +208,22 @@
</span><span class="cx"> if (JSValue earlyReturnValue = checker.earlyReturnValue())
</span><span class="cx"> return JSValue::encode(earlyReturnValue);
</span><span class="cx">
</span><del>- JSValue sourceValue = thisObject->get(exec, exec->propertyNames().source);
- if (exec->hadException())
</del><ins>+ VM& vm = exec->vm();
+ JSValue sourceValue = thisObject->get(exec, vm.propertyNames->source);
+ if (vm.exception())
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> String source = sourceValue.toString(exec)->value(exec);
</span><del>- if (exec->hadException())
</del><ins>+ if (vm.exception())
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- auto flags = flagsString(exec, thisObject);
- if (exec->hadException())
</del><ins>+ JSValue flagsValue = thisObject->get(exec, vm.propertyNames->flags);
+ if (vm.exception())
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><ins>+ String flags = flagsValue.toString(exec)->value(exec);
+ if (vm.exception())
+ return JSValue::encode(jsUndefined());
</ins><span class="cx">
</span><del>- return JSValue::encode(jsMakeNontrivialString(exec, '/', source, '/', flags.data()));
</del><ins>+ return JSValue::encode(jsMakeNontrivialString(exec, '/', source, '/', flags));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL regExpProtoGetterGlobal(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6Proxy_internal_get_calls_RegExpprototypetoStringjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/es6/Proxy_internal_get_calls_RegExp.prototype.toString.js (0 => 197999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6/Proxy_internal_get_calls_RegExp.prototype.toString.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/es6/Proxy_internal_get_calls_RegExp.prototype.toString.js 2016-03-11 07:10:18 UTC (rev 197999)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+// RegExp.prototype.toString -> Get -> [[Get]]
+function test() {
+ var get = [];
+ var p = new Proxy({}, { get: function(o, k) { get.push(k); return o[k]; }});
+ RegExp.prototype.toString.call(p);
+ return get + '' === "source,flags";
+}
+
+if (!test())
+ throw new Error("Test failed.")
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6.yaml (197998 => 197999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-11 07:05:01 UTC (rev 197998)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml 2016-03-11 07:10:18 UTC (rev 197999)
</span><span class="lines">@@ -994,6 +994,8 @@
</span><span class="cx"> cmd: runES6 :normal
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_RegExp.prototype.test.js
</span><span class="cx"> cmd: runES6 :fail
</span><ins>+- path: es6/Proxy_internal_get_calls_RegExp.prototype.toString.js
+ cmd: runES6 :normal
</ins><span class="cx"> - path: es6/Proxy_internal_get_calls_RegExp.prototype[Symbol.match].js
</span><span class="cx"> cmd: runES6 :fail
</span><span class="cx"> - path: es6/Proxy_internal_get_calls_RegExp.prototype[Symbol.replace].js
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressregexpprototypetostringjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/regexp-prototype-tostring.js (0 => 197999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/regexp-prototype-tostring.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/regexp-prototype-tostring.js 2016-03-11 07:10:18 UTC (rev 197999)
</span><span class="lines">@@ -0,0 +1,90 @@
</span><ins>+function assert(b) {
+ if (!b)
+ throw new Error("bad assertion")
+}
+function test(f) {
+ for (let i = 0; i < 100; i++)
+ f();
+}
+
+test(function() {
+ var get = [];
+ var p = new Proxy({}, { get: function(o, k) { get.push(k); return o[k]; }});
+ RegExp.prototype.toString.call(p);
+ assert(get + '' === "source,flags");
+});
+
+test(function() {
+ let handler = {
+ get: function(o, propName) {
+ switch(propName) {
+ case 'source':
+ return "foobar";
+ case 'flags':
+ return "whatever";
+ default:
+ assert(false, "should not be reached");
+ }
+ }
+ }
+ let proxy = new Proxy({}, handler);
+ let result = RegExp.prototype.toString.call(proxy);
+ assert(result === "/foobar/whatever");
+});
+
+test(function() {
+ let handler = {
+ get: function(o, propName) {
+ switch(propName) {
+ case 'source':
+ return "hello";
+ case 'flags':
+ return "y";
+ default:
+ assert(false, "should not be reached");
+ }
+ }
+ }
+
+ let proxy = new Proxy({}, handler);
+ let result = RegExp.prototype.toString.call(proxy);
+ assert(result === "/hello/y");
+});
+
+test(function() {
+ let error = null;
+ let obj = {
+ get flags() {
+ error = new Error;
+ throw error;
+ }
+ }
+
+ let threw = false;
+ try {
+ RegExp.prototype.toString.call(obj);
+ } catch(e) {
+ assert(e === error);
+ threw = true;
+ }
+ assert(threw);
+});
+
+test(function() {
+ let error = null;
+ let obj = {
+ get source() {
+ error = new Error;
+ throw error;
+ }
+ }
+
+ let threw = false;
+ try {
+ RegExp.prototype.toString.call(obj);
+ } catch(e) {
+ assert(e === error);
+ threw = true;
+ }
+ assert(threw);
+});
</ins></span></pre>
</div>
</div>
</body>
</html>