<!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>[188459] releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore</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/188459">188459</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-14 04:00:43 -0700 (Fri, 14 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188384">r188384</a> - X.[[SetPrototypeOf]](Y) should succeed if X.[[Prototype]] is already Y even if X is not extensible
https://bugs.webkit.org/show_bug.cgi?id=147930
Reviewed by Saam Barati.
When the passed prototype object to be set is the same to the existing
prototype object, [[SetPrototypeOf]] just finishes its operation even
if the extensibility of the target object is `false`.
* runtime/JSGlobalObjectFunctions.cpp:
(JSC::globalFuncProtoSetter):
* runtime/ObjectConstructor.cpp:
(JSC::objectConstructorSetPrototypeOf):
* runtime/ReflectObject.cpp:
(JSC::reflectObjectSetPrototypeOf):
* tests/stress/set-same-prototype.js: Added.
(shouldBe):
(shouldThrow):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp">releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceJavaScriptCoreruntimeObjectConstructorcpp">releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/ObjectConstructor.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceJavaScriptCoreruntimeReflectObjectcpp">releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/ReflectObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceJavaScriptCoretestsstresssetsameprototypejs">releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/tests/stress/set-same-prototype.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/ChangeLog (188458 => 188459)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/ChangeLog 2015-08-14 10:47:45 UTC (rev 188458)
+++ releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/ChangeLog 2015-08-14 11:00:43 UTC (rev 188459)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-08-13 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ X.[[SetPrototypeOf]](Y) should succeed if X.[[Prototype]] is already Y even if X is not extensible
+ https://bugs.webkit.org/show_bug.cgi?id=147930
+
+ Reviewed by Saam Barati.
+
+ When the passed prototype object to be set is the same to the existing
+ prototype object, [[SetPrototypeOf]] just finishes its operation even
+ if the extensibility of the target object is `false`.
+
+ * runtime/JSGlobalObjectFunctions.cpp:
+ (JSC::globalFuncProtoSetter):
+ * runtime/ObjectConstructor.cpp:
+ (JSC::objectConstructorSetPrototypeOf):
+ * runtime/ReflectObject.cpp:
+ (JSC::reflectObjectSetPrototypeOf):
+ * tests/stress/set-same-prototype.js: Added.
+ (shouldBe):
+ (shouldThrow):
+
</ins><span class="cx"> 2015-08-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: A {Map, WeakMap, Set, WeakSet} object contains itself will hang the console
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (188458 => 188459)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2015-08-14 10:47:45 UTC (rev 188458)
+++ releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2015-08-14 11:00:43 UTC (rev 188459)
</span><span class="lines">@@ -874,6 +874,9 @@
</span><span class="cx"> if (!value.isObject() && !value.isNull())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><ins>+ if (thisObject->prototype() == value)
+ return JSValue::encode(jsUndefined());
+
</ins><span class="cx"> if (!thisObject->isExtensible())
</span><span class="cx"> return throwVMError(exec, createTypeError(exec, StrictModeReadonlyPropertyWriteError));
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceJavaScriptCoreruntimeObjectConstructorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/ObjectConstructor.cpp (188458 => 188459)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2015-08-14 10:47:45 UTC (rev 188458)
+++ releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2015-08-14 11:00:43 UTC (rev 188459)
</span><span class="lines">@@ -208,6 +208,9 @@
</span><span class="cx"> if (!checkProtoSetterAccessAllowed(exec, object))
</span><span class="cx"> return JSValue::encode(objectValue);
</span><span class="cx">
</span><ins>+ if (object->prototype() == protoValue)
+ return JSValue::encode(objectValue);
+
</ins><span class="cx"> if (!object->isExtensible())
</span><span class="cx"> return throwVMError(exec, createTypeError(exec, StrictModeReadonlyPropertyWriteError));
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceJavaScriptCoreruntimeReflectObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/ReflectObject.cpp (188458 => 188459)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/ReflectObject.cpp 2015-08-14 10:47:45 UTC (rev 188458)
+++ releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/ReflectObject.cpp 2015-08-14 11:00:43 UTC (rev 188459)
</span><span class="lines">@@ -168,6 +168,9 @@
</span><span class="cx"> if (!checkProtoSetterAccessAllowed(exec, object))
</span><span class="cx"> return JSValue::encode(jsBoolean(false));
</span><span class="cx">
</span><ins>+ if (object->prototype() == proto)
+ return JSValue::encode(jsBoolean(true));
+
</ins><span class="cx"> if (!object->isExtensible())
</span><span class="cx"> return JSValue::encode(jsBoolean(false));
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceJavaScriptCoretestsstresssetsameprototypejs"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/tests/stress/set-same-prototype.js (0 => 188459)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/tests/stress/set-same-prototype.js (rev 0)
+++ releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/tests/stress/set-same-prototype.js 2015-08-14 11:00:43 UTC (rev 188459)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+function shouldBe(actual, expected) {
+ if (actual !== expected)
+ throw new Error('bad value: ' + actual);
+}
+
+function shouldThrow(func, errorMessage) {
+ var errorThrown = false;
+ var error = null;
+ try {
+ func();
+ } catch (e) {
+ errorThrown = true;
+ error = e;
+ }
+ if (!errorThrown)
+ throw new Error('not thrown');
+ if (String(error) !== errorMessage)
+ throw new Error(`bad error: ${String(error)}`);
+}
+
+var proto = {};
+var object = Object.preventExtensions(Object.create(proto));
+
+shouldBe(Object.setPrototypeOf(object, proto), object);
+shouldThrow(() => {
+ Object.setPrototypeOf(object, {});
+}, `TypeError: Attempted to assign to readonly property.`);
+shouldBe(Reflect.getPrototypeOf(object), proto);
+
+shouldBe(Reflect.setPrototypeOf(object, proto), true);
+shouldBe(Reflect.setPrototypeOf(object, {}), false);
+shouldBe(Reflect.getPrototypeOf(object), proto);
+
+object.__proto__ = proto;
+shouldThrow(() => {
+ object.__proto__ = {};
+}, `TypeError: Attempted to assign to readonly property.`);
+shouldBe(object.__proto__, proto);
</ins></span></pre>
</div>
</div>
</body>
</html>