<!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>[198698] 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/198698">198698</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-03-25 16:23:17 -0700 (Fri, 25 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ES6's throwing of TypeErrors on access of RegExp.prototype flag properties breaks websites.
https://bugs.webkit.org/show_bug.cgi?id=155904
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
There exists a JS library XRegExp (see http://xregexp.com) that extends the regexp
implementation. XRegExp does feature testing by comparing RegExp.prototype.sticky
to undefined. See:
Example 1. https://github.com/slevithan/xregexp/blob/28a2b033c5951477bed8c7c867ddf7e89c431cd4/tests/perf/index.html
...
} else if (knownVersion[version]) {
// Hack around ES6 incompatibility in XRegExp versions prior to 3.0.0
if (parseInt(version, 10) < 3) {
delete RegExp.prototype.sticky;
}
...
Example 2. https://github.com/slevithan/xregexp/blob/d0e665d4068cec4d15919215b098b2373f1f12e9/tests/perf/versions/xregexp-all-v2.0.0.js
...
// Check for flag y support (Firefox 3+)
hasNativeY = RegExp.prototype.sticky !== undef,
...
The ES6 spec states that we should throw a TypeError here because RegExp.prototype
is not a RegExp object, and the sticky getter is only allowed to be called on
RegExp objects. See https://tc39.github.io/ecma262/2016/#sec-get-regexp.prototype.sticky.
As a result, websites that uses XRegExp can break (e.g. some Atlassian tools).
As a workaround, we'll return undefined instead of throwing on access of these
flag properties that may be used for feature testing.
* runtime/RegExpPrototype.cpp:
(JSC::regExpProtoGetterGlobal):
(JSC::regExpProtoGetterIgnoreCase):
(JSC::regExpProtoGetterMultiline):
(JSC::regExpProtoGetterSticky):
(JSC::regExpProtoGetterUnicode):
LayoutTests:
* ietestcenter/Javascript/TestCases/15.10.7.2-1.js:
(ES5Harness.registerTest.test):
* ietestcenter/Javascript/TestCases/15.10.7.3-1.js:
(ES5Harness.registerTest.test):
* ietestcenter/Javascript/TestCases/15.10.7.4-1.js:
(ES5Harness.registerTest.test):
- updated these tests to not expect a TypeError due to the workaround.
* js/pic/cached-named-property-getter.html:
- updated this test to use the source property (which still throws a TypeError)
instead of the ignoreCase property which no longer does.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsietestcenterJavascriptTestCases1510721js">trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.7.2-1.js</a></li>
<li><a href="#trunkLayoutTestsietestcenterJavascriptTestCases1510731js">trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.7.3-1.js</a></li>
<li><a href="#trunkLayoutTestsietestcenterJavascriptTestCases1510741js">trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.7.4-1.js</a></li>
<li><a href="#trunkLayoutTestsjspiccachednamedpropertygetterhtml">trunk/LayoutTests/js/pic/cached-named-property-getter.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpPrototypecpp">trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198697 => 198698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-25 23:15:03 UTC (rev 198697)
+++ trunk/LayoutTests/ChangeLog 2016-03-25 23:23:17 UTC (rev 198698)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-03-25 Mark Lam <mark.lam@apple.com>
+
+ ES6's throwing of TypeErrors on access of RegExp.prototype flag properties breaks websites.
+ https://bugs.webkit.org/show_bug.cgi?id=155904
+
+ Reviewed by Geoffrey Garen.
+
+ * ietestcenter/Javascript/TestCases/15.10.7.2-1.js:
+ (ES5Harness.registerTest.test):
+ * ietestcenter/Javascript/TestCases/15.10.7.3-1.js:
+ (ES5Harness.registerTest.test):
+ * ietestcenter/Javascript/TestCases/15.10.7.4-1.js:
+ (ES5Harness.registerTest.test):
+ - updated these tests to not expect a TypeError due to the workaround.
+
+ * js/pic/cached-named-property-getter.html:
+ - updated this test to use the source property (which still throws a TypeError)
+ instead of the ignoreCase property which no longer does.
+
</ins><span class="cx"> 2016-03-25 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking compositing/repaint/become-overlay-composited-layer.html as flaky on ios-sim-wk2
</span></span></pre></div>
<a id="trunkLayoutTestsietestcenterJavascriptTestCases1510721js"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.7.2-1.js (198697 => 198698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.7.2-1.js 2016-03-25 23:15:03 UTC (rev 198697)
+++ trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.7.2-1.js 2016-03-25 23:23:17 UTC (rev 198698)
</span><span class="lines">@@ -27,11 +27,8 @@
</span><span class="cx"> description: "RegExp.prototype.global should throw because RegExp.prototype is not a RegExp",
</span><span class="cx">
</span><span class="cx"> test: function testcase() {
</span><del>- try {
- RegExp.prototype.global;
- return false;
- } catch (e) {
</del><ins>+ if ((typeof(RegExp.prototype.global)) === 'undefined')
</ins><span class="cx"> return true;
</span><del>- }
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestsietestcenterJavascriptTestCases1510731js"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.7.3-1.js (198697 => 198698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.7.3-1.js 2016-03-25 23:15:03 UTC (rev 198697)
+++ trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.7.3-1.js 2016-03-25 23:23:17 UTC (rev 198698)
</span><span class="lines">@@ -27,11 +27,8 @@
</span><span class="cx"> description: "RegExp.prototype.ignoreCase should throw because RegExp.prototype is not a RegExp",
</span><span class="cx">
</span><span class="cx"> test: function testcase() {
</span><del>- try {
- RegExp.prototype.ignoreCase;
- return false;
- } catch (e) {
</del><ins>+ if ((typeof(RegExp.prototype.ignoreCase)) === 'undefined')
</ins><span class="cx"> return true;
</span><del>- }
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestsietestcenterJavascriptTestCases1510741js"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.7.4-1.js (198697 => 198698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.7.4-1.js 2016-03-25 23:15:03 UTC (rev 198697)
+++ trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.7.4-1.js 2016-03-25 23:23:17 UTC (rev 198698)
</span><span class="lines">@@ -27,11 +27,8 @@
</span><span class="cx"> description: "RegExp.prototype.multiline should throw because RegExp.prototype is not a RegExp",
</span><span class="cx">
</span><span class="cx"> test: function testcase() {
</span><del>- try {
- RegExp.prototype.multiline;
- return false;
- } catch (e) {
</del><ins>+ if ((typeof(RegExp.prototype.multiline)) === 'undefined')
</ins><span class="cx"> return true;
</span><del>- }
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestsjspiccachednamedpropertygetterhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/pic/cached-named-property-getter.html (198697 => 198698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/pic/cached-named-property-getter.html 2016-03-25 23:15:03 UTC (rev 198697)
+++ trunk/LayoutTests/js/pic/cached-named-property-getter.html 2016-03-25 23:23:17 UTC (rev 198698)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> function testCustomGetter(o) {
</span><span class="cx"> for (var i = 0; i < 10; i++)
</span><del>- o.ignoreCase;
</del><ins>+ o.source;
</ins><span class="cx"> }
</span><span class="cx"> var r=/a/;
</span><span class="cx"> testCustomGetter(r);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198697 => 198698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-25 23:15:03 UTC (rev 198697)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-25 23:23:17 UTC (rev 198698)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2016-03-25 Mark Lam <mark.lam@apple.com>
+
+ ES6's throwing of TypeErrors on access of RegExp.prototype flag properties breaks websites.
+ https://bugs.webkit.org/show_bug.cgi?id=155904
+
+ Reviewed by Geoffrey Garen.
+
+ There exists a JS library XRegExp (see http://xregexp.com) that extends the regexp
+ implementation. XRegExp does feature testing by comparing RegExp.prototype.sticky
+ to undefined. See:
+
+ Example 1. https://github.com/slevithan/xregexp/blob/28a2b033c5951477bed8c7c867ddf7e89c431cd4/tests/perf/index.html
+ ...
+ } else if (knownVersion[version]) {
+ // Hack around ES6 incompatibility in XRegExp versions prior to 3.0.0
+ if (parseInt(version, 10) < 3) {
+ delete RegExp.prototype.sticky;
+ }
+ ...
+
+ Example 2. https://github.com/slevithan/xregexp/blob/d0e665d4068cec4d15919215b098b2373f1f12e9/tests/perf/versions/xregexp-all-v2.0.0.js
+ ...
+ // Check for flag y support (Firefox 3+)
+ hasNativeY = RegExp.prototype.sticky !== undef,
+ ...
+
+ The ES6 spec states that we should throw a TypeError here because RegExp.prototype
+ is not a RegExp object, and the sticky getter is only allowed to be called on
+ RegExp objects. See https://tc39.github.io/ecma262/2016/#sec-get-regexp.prototype.sticky.
+ As a result, websites that uses XRegExp can break (e.g. some Atlassian tools).
+
+ As a workaround, we'll return undefined instead of throwing on access of these
+ flag properties that may be used for feature testing.
+
+ * runtime/RegExpPrototype.cpp:
+ (JSC::regExpProtoGetterGlobal):
+ (JSC::regExpProtoGetterIgnoreCase):
+ (JSC::regExpProtoGetterMultiline):
+ (JSC::regExpProtoGetterSticky):
+ (JSC::regExpProtoGetterUnicode):
+
</ins><span class="cx"> 2016-03-25 Caitlin Potter <caitp@igalia.com>
</span><span class="cx">
</span><span class="cx"> [JSC] fix divide-by-zero in String.prototype.padStart/padEnd
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp (198697 => 198698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp 2016-03-25 23:15:03 UTC (rev 198697)
+++ trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp 2016-03-25 23:23:17 UTC (rev 198698)
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> if (!thisValue.inherits(RegExpObject::info()))
</span><del>- return throwVMTypeError(exec);
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx">
</span><span class="cx"> return JSValue::encode(jsBoolean(asRegExpObject(thisValue)->regExp()->global()));
</span><span class="cx"> }
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> if (!thisValue.inherits(RegExpObject::info()))
</span><del>- return throwVMTypeError(exec);
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx">
</span><span class="cx"> return JSValue::encode(jsBoolean(asRegExpObject(thisValue)->regExp()->ignoreCase()));
</span><span class="cx"> }
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> if (!thisValue.inherits(RegExpObject::info()))
</span><del>- return throwVMTypeError(exec);
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx">
</span><span class="cx"> return JSValue::encode(jsBoolean(asRegExpObject(thisValue)->regExp()->multiline()));
</span><span class="cx"> }
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> if (!thisValue.inherits(RegExpObject::info()))
</span><del>- return throwVMTypeError(exec);
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx">
</span><span class="cx"> return JSValue::encode(jsBoolean(asRegExpObject(thisValue)->regExp()->sticky()));
</span><span class="cx"> }
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> {
</span><span class="cx"> JSValue thisValue = exec->thisValue();
</span><span class="cx"> if (!thisValue.inherits(RegExpObject::info()))
</span><del>- return throwVMTypeError(exec);
</del><ins>+ return JSValue::encode(jsUndefined());
</ins><span class="cx">
</span><span class="cx"> return JSValue::encode(jsBoolean(asRegExpObject(thisValue)->regExp()->unicode()));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>