<!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>[198447] 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/198447">198447</a></dd>

<dt>Author</dt> <dd>mark.lam@apple.com</dd>

<dt>Date</dt> <dd>2016-03-18 16:14:34 -0700 (Fri, 18 Mar 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>ES6 spec requires that RegExpPrototype not be a RegExp object.

https://bugs.webkit.org/show_bug.cgi?id=155654

Reviewed by Filip Pizlo.

Source/JavaScriptCore:

The ES6 spec states that RegExp.prototype should not be an instance of RegExp:

https://tc39.github.io/ecma262/#sec-properties-of-the-regexp-prototype-object

&quot;The RegExp prototype object is an ordinary object. It is not a RegExp instance

and does not have a [[RegExpMatcher]] internal slot or any of the other internal

slots of RegExp instance objects.&quot;

This patch changes RegExpPrototype to conform to the above specifications.

* runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::init):

* runtime/RegExpConstructor.cpp:

(JSC::RegExpConstructor::RegExpConstructor):

(JSC::RegExpConstructor::finishCreation):

* runtime/RegExpPrototype.cpp:

(JSC::RegExpPrototype::RegExpPrototype):

(JSC::RegExpPrototype::finishCreation):

(JSC::RegExpPrototype::getOwnPropertySlot):

(JSC::RegExpPrototype::visitChildren):

(JSC::regExpProtoFuncTest):

* runtime/RegExpPrototype.h:

(JSC::RegExpPrototype::create):

(JSC::RegExpPrototype::createStructure):

(JSC::RegExpPrototype::emptyRegExp):

* tests/es6.yaml:

- This patch makes the es6/miscellaneous_built-in_prototypes_are_not_instances.js

  test now pass.  However, the kangax version of this test still fails because

  it also checks Error objects (which will be fixed in a subsequent patch).

* tests/mozilla/ecma_2/shell.js:

(stringify):

(test):

(getFailedCases):

(err):

* tests/stress/static-getter-in-names.js:

(shouldBe):

LayoutTests:

Rebase all the test results.

* fast/regex/script-tests/toString.js:

* fast/regex/toString-expected.txt:

* ietestcenter/Javascript/15.10.6-expected.txt:

* ietestcenter/Javascript/15.10.7.1-1-expected.txt:

* ietestcenter/Javascript/15.10.7.2-1-expected.txt:

* ietestcenter/Javascript/15.10.7.3-1-expected.txt:

* ietestcenter/Javascript/15.10.7.4-1-expected.txt:

* ietestcenter/Javascript/15.10.7.5-1-expected.txt:

* ietestcenter/Javascript/TestCases/15.10.6.js:

(ES5Harness.registerTest.test):

* ietestcenter/Javascript/TestCases/15.10.7.1-1.js:

(ES5Harness.registerTest.test):

* 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):

* ietestcenter/Javascript/TestCases/15.10.7.5-1.js:

(ES5Harness.registerTest.test):

* js/Object-getOwnPropertyNames-expected.txt:

* js/kde/RegExp-expected.txt:

* js/kde/script-tests/RegExp.js:

* js/script-tests/Object-getOwnPropertyNames.js:

* sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.6/S15.10.6_A2-expected.txt:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>

<li><a href="#trunkLayoutTestsfastregexscriptteststoStringjs">trunk/LayoutTests/fast/regex/script-tests/toString.js</a></li>

<li><a href="#trunkLayoutTestsfastregextoStringexpectedtxt">trunk/LayoutTests/fast/regex/toString-expected.txt</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascript15106expectedtxt">trunk/LayoutTests/ietestcenter/Javascript/15.10.6-expected.txt</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascript1510711expectedtxt">trunk/LayoutTests/ietestcenter/Javascript/15.10.7.1-1-expected.txt</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascript1510721expectedtxt">trunk/LayoutTests/ietestcenter/Javascript/15.10.7.2-1-expected.txt</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascript1510731expectedtxt">trunk/LayoutTests/ietestcenter/Javascript/15.10.7.3-1-expected.txt</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascript1510741expectedtxt">trunk/LayoutTests/ietestcenter/Javascript/15.10.7.4-1-expected.txt</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascript1510751expectedtxt">trunk/LayoutTests/ietestcenter/Javascript/15.10.7.5-1-expected.txt</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascriptTestCases15106js">trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.6.js</a></li>

<li><a href="#trunkLayoutTestsietestcenterJavascriptTestCases1510711js">trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.7.1-1.js</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="#trunkLayoutTestsietestcenterJavascriptTestCases1510751js">trunk/LayoutTests/ietestcenter/Javascript/TestCases/15.10.7.5-1.js</a></li>

<li><a href="#trunkLayoutTestsjsObjectgetOwnPropertyNamesexpectedtxt">trunk/LayoutTests/js/Object-getOwnPropertyNames-expected.txt</a></li>

<li><a href="#trunkLayoutTestsjskdeRegExpexpectedtxt">trunk/LayoutTests/js/kde/RegExp-expected.txt</a></li>

<li><a href="#trunkLayoutTestsjskdescripttestsRegExpjs">trunk/LayoutTests/js/kde/script-tests/RegExp.js</a></li>

<li><a href="#trunkLayoutTestsjsscripttestsObjectgetOwnPropertyNamesjs">trunk/LayoutTests/js/script-tests/Object-getOwnPropertyNames.js</a></li>

<li><a href="#trunkLayoutTestssputnikConformance15_Native_Objects1510_RegExp15106S15106_A2expectedtxt">trunk/LayoutTests/sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.6/S15.10.6_A2-expected.txt</a></li>

<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpConstructorcpp">trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpPrototypecpp">trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpPrototypeh">trunk/Source/JavaScriptCore/runtime/RegExpPrototype.h</a></li>

<li><a href="#trunkSourceJavaScriptCoretestses6yaml">trunk/Source/JavaScriptCore/tests/es6.yaml</a></li>

<li><a href="#trunkSourceJavaScriptCoretestsmozillaecma_2shelljs">trunk/Source/JavaScriptCore/tests/mozilla/ecma_2/shell.js</a></li>

<li><a href="#trunkSourceJavaScriptCoretestsstressstaticgetterinnamesjs">trunk/Source/JavaScriptCore/tests/stress/static-getter-in-names.js</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198446 => 198447)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2016-03-18 22:35:33 UTC (rev 198446)

+++ trunk/LayoutTests/ChangeLog        2016-03-18 23:14:34 UTC (rev 198447)

</span><span class="lines">@@ -1,3 +1,38 @@

</span><ins>+2016-03-18  Mark Lam  &lt;mark.lam@apple.com&gt;

+

+        ES6 spec requires that RegExpPrototype not be a RegExp object.

+        https://bugs.webkit.org/show_bug.cgi?id=155654

+

+        Reviewed by Filip Pizlo.

+

+        Rebase all the test results.

+

+        * fast/regex/script-tests/toString.js:

+        * fast/regex/toString-expected.txt:

+        * ietestcenter/Javascript/15.10.6-expected.txt:

+        * ietestcenter/Javascript/15.10.7.1-1-expected.txt:

+        * ietestcenter/Javascript/15.10.7.2-1-expected.txt:

+        * ietestcenter/Javascript/15.10.7.3-1-expected.txt:

+        * ietestcenter/Javascript/15.10.7.4-1-expected.txt:

+        * ietestcenter/Javascript/15.10.7.5-1-expected.txt:

+        * ietestcenter/Javascript/TestCases/15.10.6.js:

+        (ES5Harness.registerTest.test):

+        * ietestcenter/Javascript/TestCases/15.10.7.1-1.js:

+        (ES5Harness.registerTest.test):

+        * 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):

+        * ietestcenter/Javascript/TestCases/15.10.7.5-1.js:

+        (ES5Harness.registerTest.test):

+        * js/Object-getOwnPropertyNames-expected.txt:

+        * js/kde/RegExp-expected.txt:

+        * js/kde/script-tests/RegExp.js:

+        * js/script-tests/Object-getOwnPropertyNames.js:

+        * sputnik/Conformance/15_Native_Objects/15.10_RegExp/15.10.6/S15.10.6_A2-expected.txt:

+

</ins><span class="cx"> 2016-03-18  Brent Fulgham  &lt;bfulgham@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Local file restrictions should not block sessionStorage access

</span></span></pre></div>

<a id="trunkLayoutTestsfastregexscriptteststoStringjs"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regex/script-tests/toString.js (198446 => 198447)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/regex/script-tests/toString.js        2016-03-18 22:35:33 UTC (rev 198446)

+++ trunk/LayoutTests/fast/regex/script-tests/toString.js        2016-03-18 23:14:34 UTC (rev 198447)

</span><span class="lines">@@ -19,11 +19,11 @@

</span><span class="cx"> 

</span><span class="cx"> shouldBe(&quot;RegExp('/').source&quot;, '&quot;\\\\/&quot;');

</span><span class="cx"> shouldBe(&quot;RegExp('').source&quot;, '&quot;(?:)&quot;');

</span><del>-shouldBe(&quot;RegExp.prototype.source&quot;, '&quot;(?:)&quot;');

</del><ins>+shouldThrow(&quot;RegExp.prototype.source&quot;, '&quot;TypeError: Type error&quot;');

</ins><span class="cx"> 

</span><span class="cx"> shouldBe(&quot;RegExp('/').toString()&quot;, '&quot;/\\\\//&quot;');

</span><span class="cx"> shouldBe(&quot;RegExp('').toString()&quot;, '&quot;/(?:)/&quot;');

</span><del>-shouldBe(&quot;RegExp.prototype.toString()&quot;, '&quot;/(?:)/&quot;');

</del><ins>+shouldThrow(&quot;RegExp.prototype.toString()&quot;, '&quot;TypeError: Type error&quot;');

</ins><span class="cx"> 

<span class="cx"> // These strings are equivalent, since the '\' is identity escaping the '/' at the string level.

</span><span class="cx"> shouldBeTrue('testForwardSlash(&quot;^/$&quot;, &quot;/&quot;);');

</span></span></pre></div>

<a id="trunkLayoutTestsfastregextoStringexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regex/toString-expected.txt (198446 => 198447)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/regex/toString-expected.txt        2016-03-18 22:35:33 UTC (rev 198446)

+++ trunk/LayoutTests/fast/regex/toString-expected.txt        2016-03-18 23:14:34 UTC (rev 198447)

</span><span class="lines">@@ -5,10 +5,10 @@

</span><span class="cx"> 

</span><span class="cx"> PASS RegExp('/').source is &quot;\\/&quot;

</span><span class="cx"> PASS RegExp('').source is &quot;(?:)&quot;

</span><del>-PASS RegExp.prototype.source is &quot;(?:)&quot;

</del><ins>+PASS RegExp.prototype.source threw exception TypeError: Type error.

</ins><span class="cx"> PASS RegExp('/').toString() is &quot;/\\//&quot;

</span><span class="cx"> PASS RegExp('').toString() is &quot;/(?:)/&quot;

</span><del>-PASS RegExp.prototype.toString() is &quot;/(?:)/&quot;

</del><ins>+PASS RegExp.prototype.toString() threw exception TypeError: Type error.

</ins><span class="cx"> PASS testForwardSlash(&quot;^/$&quot;, &quot;/&quot;); is true

</span><span class="cx"> PASS testForwardSlash(&quot;^/$&quot;, &quot;/&quot;); is true

</span><span class="cx"> PASS testForwardSlash(&quot;^\/$&quot;, &quot;/&quot;); is true

</span></span></pre></div>

<a id="trunkLayoutTestsietestcenterJavascript15106expectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ietestcenter/Javascript/15.10.6-expected.txt (198446 => 198447)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ietestcenter/Javascript/15.10.6-expected.txt        2016-03-18 22:35:33 UTC (rev 198446)

+++ trunk/LayoutTests/ietestcenter/Javascript/15.10.6-expected.txt        2016-03-18 23:14:34 UTC (rev 198447)

</span><span class="lines">@@ -1,4 +1,4 @@

</span><del>-15.10.6 (TestCases/chapter15/15.10/15.10.6/15.10.6.js) RegExp.prototype is itself a RegExp

</del><ins>+15.10.6 (TestCases/chapter15/15.10/15.10.6/15.10.6.js) RegExp.prototype is not a RegExp

</ins><span class="cx"> 