<!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>[202832] 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/202832">202832</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-05 14:08:38 -0700 (Tue, 05 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] The prototype cycle checks throws the wrong error type
https://bugs.webkit.org/show_bug.cgi?id=159393
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-07-05
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
We were supposed to throw the TypeError:
-https://tc39.github.io/ecma262/#sec-set-object.prototype.__proto__
* runtime/JSObject.cpp:
(JSC::JSObject::setPrototypeWithCycleCheck):
LayoutTests:
* js/cyclic-prototypes-expected.txt:
* js/script-tests/cyclic-prototypes.js:
(catch):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomWindowscripttestswindowcustomprototypejs">trunk/LayoutTests/fast/dom/Window/script-tests/window-custom-prototype.js</a></li>
<li><a href="#trunkLayoutTestsfastdomWindowwindowcustomprototypeexpectedtxt">trunk/LayoutTests/fast/dom/Window/window-custom-prototype-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjscyclicprototypesexpectedtxt">trunk/LayoutTests/js/cyclic-prototypes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsdomcyclicprotoexpectedtxt">trunk/LayoutTests/js/dom/cyclic-proto-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestscyclicprototypesjs">trunk/LayoutTests/js/script-tests/cyclic-prototypes.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202831 => 202832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-05 20:38:22 UTC (rev 202831)
+++ trunk/LayoutTests/ChangeLog 2016-07-05 21:08:38 UTC (rev 202832)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-07-05 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] The prototype cycle checks throws the wrong error type
+ https://bugs.webkit.org/show_bug.cgi?id=159393
+
+ Reviewed by Geoffrey Garen.
+
+ * js/cyclic-prototypes-expected.txt:
+ * js/script-tests/cyclic-prototypes.js:
+ (catch):
+
</ins><span class="cx"> 2016-07-05 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r202641): Netflix playback stalls after a few seconds
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowscripttestswindowcustomprototypejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/Window/script-tests/window-custom-prototype.js (202831 => 202832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/script-tests/window-custom-prototype.js 2016-07-05 20:38:22 UTC (rev 202831)
+++ trunk/LayoutTests/fast/dom/Window/script-tests/window-custom-prototype.js 2016-07-05 21:08:38 UTC (rev 202832)
</span><span class="lines">@@ -4,12 +4,12 @@
</span><span class="cx"> var chainPointingBackToWindow = { __proto__: window };
</span><span class="cx"> var anotherObject = { };
</span><span class="cx">
</span><del>-shouldThrow("__proto__ = window; __proto", "'Error: cyclic __proto__ value'");
-shouldThrow("__proto__ = chainPointingBackToWindow; __proto__", "'Error: cyclic __proto__ value'");
</del><ins>+shouldThrow("__proto__ = window; __proto", "'TypeError: cyclic __proto__ value'");
+shouldThrow("__proto__ = chainPointingBackToWindow; __proto__", "'TypeError: cyclic __proto__ value'");
</ins><span class="cx"> shouldBe("__proto__ = 1; __proto__", "originalWindowPrototype");
</span><span class="cx"> shouldBe("__proto__ = 'a string'; __proto__", "originalWindowPrototype");
</span><span class="cx"> shouldBe("__proto__ = anotherObject; __proto__", "anotherObject");
</span><del>-shouldThrow("anotherObject.__proto__ = window; __proto__", "'Error: cyclic __proto__ value'");
</del><ins>+shouldThrow("anotherObject.__proto__ = window; __proto__", "'TypeError: cyclic __proto__ value'");
</ins><span class="cx"> shouldBe("__proto__ = 1; __proto__", "anotherObject");
</span><span class="cx"> shouldBe("__proto__ = 'a string'; __proto__", "anotherObject");
</span><span class="cx"> shouldBe("__proto__ = anotherObject; __proto__", "anotherObject");
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomWindowwindowcustomprototypeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/Window/window-custom-prototype-expected.txt (202831 => 202832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/Window/window-custom-prototype-expected.txt 2016-07-05 20:38:22 UTC (rev 202831)
+++ trunk/LayoutTests/fast/dom/Window/window-custom-prototype-expected.txt 2016-07-05 21:08:38 UTC (rev 202832)
</span><span class="lines">@@ -3,12 +3,12 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS __proto__ = window; __proto threw exception Error: cyclic __proto__ value.
-PASS __proto__ = chainPointingBackToWindow; __proto__ threw exception Error: cyclic __proto__ value.
</del><ins>+PASS __proto__ = window; __proto threw exception TypeError: cyclic __proto__ value.
+PASS __proto__ = chainPointingBackToWindow; __proto__ threw exception TypeError: cyclic __proto__ value.
</ins><span class="cx"> PASS __proto__ = 1; __proto__ is originalWindowPrototype
</span><span class="cx"> PASS __proto__ = 'a string'; __proto__ is originalWindowPrototype
</span><span class="cx"> PASS __proto__ = anotherObject; __proto__ is anotherObject
</span><del>-PASS anotherObject.__proto__ = window; __proto__ threw exception Error: cyclic __proto__ value.
</del><ins>+PASS anotherObject.__proto__ = window; __proto__ threw exception TypeError: cyclic __proto__ value.
</ins><span class="cx"> PASS __proto__ = 1; __proto__ is anotherObject
</span><span class="cx"> PASS __proto__ = 'a string'; __proto__ is anotherObject
</span><span class="cx"> PASS __proto__ = anotherObject; __proto__ is anotherObject
</span></span></pre></div>
<a id="trunkLayoutTestsjscyclicprototypesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/cyclic-prototypes-expected.txt (202831 => 202832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/cyclic-prototypes-expected.txt 2016-07-05 20:38:22 UTC (rev 202831)
+++ trunk/LayoutTests/js/cyclic-prototypes-expected.txt 2016-07-05 21:08:38 UTC (rev 202832)
</span><span class="lines">@@ -3,12 +3,14 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS o1.__proto__ = o3; threw exception Error: cyclic __proto__ value.
-PASS Object.setPrototypeOf(o1, o3) threw exception Error: cyclic __proto__ value.
</del><ins>+PASS o1.__proto__ = o3; threw exception TypeError: cyclic __proto__ value.
+PASS Object.setPrototypeOf(o1, o3) threw exception TypeError: cyclic __proto__ value.
+PASS globalException.constructor is TypeError
+PASS globalException.constructor is TypeError
</ins><span class="cx"> PASS ({}).hasOwnProperty.call(o1, '__proto__') is false
</span><span class="cx"> PASS ({}).hasOwnProperty.call(o1, '__proto__') is true
</span><span class="cx"> PASS Object.getPrototypeOf(o1) is null
</span><del>-PASS Object.setPrototypeOf(o1, o3) threw exception Error: cyclic __proto__ value.
</del><ins>+PASS Object.setPrototypeOf(o1, o3) threw exception TypeError: cyclic __proto__ value.
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsjsdomcyclicprotoexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/cyclic-proto-expected.txt (202831 => 202832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/cyclic-proto-expected.txt 2016-07-05 20:38:22 UTC (rev 202831)
+++ trunk/LayoutTests/js/dom/cyclic-proto-expected.txt 2016-07-05 21:08:38 UTC (rev 202832)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS x.__proto__ = x; threw exception Error: cyclic __proto__ value.
</del><ins>+PASS x.__proto__ = x; threw exception TypeError: cyclic __proto__ value.
</ins><span class="cx"> PASS x.__proto__ is originalProto
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestscyclicprototypesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/cyclic-prototypes.js (202831 => 202832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/cyclic-prototypes.js 2016-07-05 20:38:22 UTC (rev 202831)
+++ trunk/LayoutTests/js/script-tests/cyclic-prototypes.js 2016-07-05 21:08:38 UTC (rev 202832)
</span><span class="lines">@@ -7,9 +7,24 @@
</span><span class="cx"> o3.__proto__ = o2;
</span><span class="cx">
</span><span class="cx"> // Try to create a cyclical prototype chain.
</span><del>-shouldThrow("o1.__proto__ = o3;");
-shouldThrow("Object.setPrototypeOf(o1, o3)");
</del><ins>+shouldThrow("o1.__proto__ = o3;", "'TypeError: cyclic __proto__ value'");
+shouldThrow("Object.setPrototypeOf(o1, o3)", "'TypeError: cyclic __proto__ value'");
+var globalException;
+try {
+ o1.__proto__ = o3;
+} catch (e) {
+ globalException = e;
+}
+shouldBe("globalException.constructor", "TypeError");
</ins><span class="cx">
</span><ins>+globalException = undefined;
+try {
+ Object.setPrototypeOf(o1, o3);
+} catch (e) {
+ globalException = e;
+}
+shouldBe("globalException.constructor", "TypeError");
+
</ins><span class="cx"> // This changes __proto__ setter behaviour, since __proto__ is an accessor on Object.prototype.
</span><span class="cx"> o1.__proto__ = null;
</span><span class="cx"> shouldBeFalse("({}).hasOwnProperty.call(o1, '__proto__')");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202831 => 202832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-05 20:38:22 UTC (rev 202831)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-05 21:08:38 UTC (rev 202832)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-07-05 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] The prototype cycle checks throws the wrong error type
+ https://bugs.webkit.org/show_bug.cgi?id=159393
+
+ Reviewed by Geoffrey Garen.
+
+ We were supposed to throw the TypeError:
+ -https://tc39.github.io/ecma262/#sec-set-object.prototype.__proto__
+
+ * runtime/JSObject.cpp:
+ (JSC::JSObject::setPrototypeWithCycleCheck):
+
</ins><span class="cx"> 2016-07-05 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> our parsing for "use strict" is wrong when we first parse other directives that are not "use strict" but are located in a place where "use strict" would be valid
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.cpp (202831 => 202832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-07-05 20:38:22 UTC (rev 202831)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.cpp 2016-07-05 21:08:38 UTC (rev 202832)
</span><span class="lines">@@ -1366,7 +1366,7 @@
</span><span class="cx"> while (nextPrototype && nextPrototype.isObject()) {
</span><span class="cx"> if (nextPrototype == this) {
</span><span class="cx"> if (shouldThrowIfCantSet)
</span><del>- vm.throwException(exec, createError(exec, ASCIILiteral("cyclic __proto__ value")));
</del><ins>+ throwTypeError(exec, ASCIILiteral("cyclic __proto__ value"));
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> if (UNLIKELY(asObject(nextPrototype)->methodTable(vm)->getPrototype != defaultGetPrototype))
</span></span></pre>
</div>
</div>
</body>
</html>