<!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>[197512] trunk/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/197512">197512</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-03-03 11:18:35 -0800 (Thu, 03 Mar 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>[[SetPrototypeOf]] isn't properly implemented everywhere
https://bugs.webkit.org/show_bug.cgi?id=154943

Reviewed by Benjamin Poulain.

We were copy-pasting implememntation bits that belong in OrdinarySetPrototypeOf 
in a few different places that call O.[[SetPrototypeOf]](v)
rather than having those bits in OrdinarySetPrototypeOf itself.
We need to put those copy-pasted bits into OrdinarySetPrototypeOf
and not the call sites of O.[[SetPrototypeOf]](v) because
O.[[SetPrototypeOf]](v) won't always call into OrdinarySetPrototypeOf.
This is needed for correctness because this behavior is now observable
with the ES6 Proxy object.

* runtime/ClassInfo.h:
* runtime/JSCell.cpp:
(JSC::JSCell::isExtensible):
(JSC::JSCell::setPrototype):
* runtime/JSCell.h:
* runtime/JSGlobalObjectFunctions.cpp:
(JSC::globalFuncProtoSetter):
* runtime/JSObject.cpp:
(JSC::JSObject::setPrototypeDirect):
(JSC::JSObject::setPrototypeWithCycleCheck):
(JSC::JSObject::setPrototype):
(JSC::JSObject::allowsAccessFrom):
* runtime/JSObject.h:
(JSC::JSObject::mayInterceptIndexedAccesses):
* runtime/ObjectConstructor.cpp:
(JSC::objectConstructorSetPrototypeOf):
* runtime/ReflectObject.cpp:
(JSC::reflectObjectSetPrototypeOf):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeClassInfoh">trunk/Source/JavaScriptCore/runtime/ClassInfo.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCellcpp">trunk/Source/JavaScriptCore/runtime/JSCell.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCellh">trunk/Source/JavaScriptCore/runtime/JSCell.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjectcpp">trunk/Source/JavaScriptCore/runtime/JSObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectConstructorcpp">trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeReflectObjectcpp">trunk/Source/JavaScriptCore/runtime/ReflectObject.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197511 => 197512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-03-03 18:34:11 UTC (rev 197511)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-03-03 19:18:35 UTC (rev 197512)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-03-03  Saam barati  &lt;sbarati@apple.com&gt;
+
+        [[SetPrototypeOf]] isn't properly implemented everywhere
+        https://bugs.webkit.org/show_bug.cgi?id=154943
+
+        Reviewed by Benjamin Poulain.
+
+        We were copy-pasting implememntation bits that belong in OrdinarySetPrototypeOf 
+        in a few different places that call O.[[SetPrototypeOf]](v)
+        rather than having those bits in OrdinarySetPrototypeOf itself.
+        We need to put those copy-pasted bits into OrdinarySetPrototypeOf
+        and not the call sites of O.[[SetPrototypeOf]](v) because
+        O.[[SetPrototypeOf]](v) won't always call into OrdinarySetPrototypeOf.
+        This is needed for correctness because this behavior is now observable
+        with the ES6 Proxy object.
+
+        * runtime/ClassInfo.h:
+        * runtime/JSCell.cpp:
+        (JSC::JSCell::isExtensible):
+        (JSC::JSCell::setPrototype):
+        * runtime/JSCell.h:
+        * runtime/JSGlobalObjectFunctions.cpp:
+        (JSC::globalFuncProtoSetter):
+        * runtime/JSObject.cpp:
+        (JSC::JSObject::setPrototypeDirect):
+        (JSC::JSObject::setPrototypeWithCycleCheck):
+        (JSC::JSObject::setPrototype):
+        (JSC::JSObject::allowsAccessFrom):
+        * runtime/JSObject.h:
+        (JSC::JSObject::mayInterceptIndexedAccesses):
+        * runtime/ObjectConstructor.cpp:
+        (JSC::objectConstructorSetPrototypeOf):
+        * runtime/ReflectObject.cpp:
+        (JSC::reflectObjectSetPrototypeOf):
+
</ins><span class="cx"> 2016-03-03  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix Windows build after r197489.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeClassInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ClassInfo.h (197511 => 197512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ClassInfo.h        2016-03-03 18:34:11 UTC (rev 197511)
+++ trunk/Source/JavaScriptCore/runtime/ClassInfo.h        2016-03-03 19:18:35 UTC (rev 197512)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">     typedef bool (*IsExtensibleFunctionPtr)(JSObject*, ExecState*);
</span><span class="cx">     IsExtensibleFunctionPtr isExtensible;
</span><span class="cx"> 
</span><del>-    typedef bool (*SetPrototypeFunctionPtr)(JSObject*, ExecState*, JSValue);
</del><ins>+    typedef bool (*SetPrototypeFunctionPtr)(JSObject*, ExecState*, JSValue, bool shouldThrowIfCantSet);
</ins><span class="cx">     SetPrototypeFunctionPtr setPrototype;
</span><span class="cx"> 
</span><span class="cx">     typedef void (*DumpToStreamFunctionPtr)(const JSCell*, PrintStream&amp;);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCell.cpp (197511 => 197512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCell.cpp        2016-03-03 18:34:11 UTC (rev 197511)
+++ trunk/Source/JavaScriptCore/runtime/JSCell.cpp        2016-03-03 19:18:35 UTC (rev 197512)
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx">     RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool JSCell::setPrototype(JSObject*, ExecState*, JSValue)
</del><ins>+bool JSCell::setPrototype(JSObject*, ExecState*, JSValue, bool)
</ins><span class="cx"> {
</span><span class="cx">     RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCell.h (197511 => 197512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCell.h        2016-03-03 18:34:11 UTC (rev 197511)
+++ trunk/Source/JavaScriptCore/runtime/JSCell.h        2016-03-03 19:18:35 UTC (rev 197512)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx">     static NO_RETURN_DUE_TO_CRASH void getGenericPropertyNames(JSObject*, ExecState*, PropertyNameArray&amp;, EnumerationMode);
</span><span class="cx">     static NO_RETURN_DUE_TO_CRASH bool preventExtensions(JSObject*, ExecState*);
</span><span class="cx">     static NO_RETURN_DUE_TO_CRASH bool isExtensible(JSObject*, ExecState*);
</span><del>-    static NO_RETURN_DUE_TO_CRASH bool setPrototype(JSObject*, ExecState*, JSValue);
</del><ins>+    static NO_RETURN_DUE_TO_CRASH bool setPrototype(JSObject*, ExecState*, JSValue, bool);
</ins><span class="cx"> 
</span><span class="cx">     static String className(const JSObject*);
</span><span class="cx">     JS_EXPORT_PRIVATE static bool customHasInstance(JSObject*, ExecState*, JSValue);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (197511 => 197512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp        2016-03-03 18:34:11 UTC (rev 197511)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp        2016-03-03 19:18:35 UTC (rev 197512)
</span><span class="lines">@@ -882,22 +882,9 @@
</span><span class="cx">     if (!value.isObject() &amp;&amp; !value.isNull())
</span><span class="cx">         return JSValue::encode(jsUndefined());
</span><span class="cx"> 
</span><del>-    if (thisObject-&gt;prototype() == value)
-        return JSValue::encode(jsUndefined());
-
-    bool isExtensible = thisObject-&gt;isExtensible(exec);
-    if (exec-&gt;hadException())
-        return JSValue::encode(jsUndefined());
-    if (!isExtensible)
-        return throwVMError(exec, createTypeError(exec, StrictModeReadonlyPropertyWriteError));
-
</del><span class="cx">     VM&amp; vm = exec-&gt;vm();
</span><del>-    if (!thisObject-&gt;setPrototype(vm, exec, value)) {
-        if (!vm.exception())
-            vm.throwException(exec, createError(exec, ASCIILiteral(&quot;cyclic __proto__ value&quot;)));
-        return JSValue::encode(jsUndefined());
-    }
-    ASSERT(!exec-&gt;hadException());
</del><ins>+    bool shouldThrowIfCantSet = true;
+    thisObject-&gt;setPrototype(vm, exec, value, shouldThrowIfCantSet);
</ins><span class="cx">     return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.cpp (197511 => 197512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.cpp        2016-03-03 18:34:11 UTC (rev 197511)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.cpp        2016-03-03 19:18:35 UTC (rev 197512)
</span><span class="lines">@@ -1197,28 +1197,44 @@
</span><span class="cx">     switchToSlowPutArrayStorage(vm);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool JSObject::setPrototypeWithCycleCheck(VM&amp; vm, ExecState* exec, JSValue prototype)
</del><ins>+bool JSObject::setPrototypeWithCycleCheck(VM&amp; vm, ExecState* exec, JSValue prototype, bool shouldThrowIfCantSet)
</ins><span class="cx"> {
</span><del>-    UNUSED_PARAM(exec);
</del><span class="cx">     ASSERT(methodTable(vm)-&gt;toThis(this, exec, NotStrictMode) == this);
</span><ins>+
+    if (this-&gt;prototype() == prototype)
+        return true;
+
+    bool isExtensible = this-&gt;isExtensible(exec);
+    if (vm.exception())
+        return false;
+
+    if (!isExtensible) {
+        if (shouldThrowIfCantSet)
+            throwVMError(exec, createTypeError(exec, StrictModeReadonlyPropertyWriteError));
+        return false;
+    }
+
</ins><span class="cx">     JSValue nextPrototype = prototype;
</span><span class="cx">     while (nextPrototype &amp;&amp; nextPrototype.isObject()) {
</span><del>-        if (nextPrototype == this)
</del><ins>+        if (nextPrototype == this) {
+            if (shouldThrowIfCantSet)
+                vm.throwException(exec, createError(exec, ASCIILiteral(&quot;cyclic __proto__ value&quot;)));
</ins><span class="cx">             return false;
</span><ins>+        }
</ins><span class="cx">         nextPrototype = asObject(nextPrototype)-&gt;prototype();
</span><span class="cx">     }
</span><span class="cx">     setPrototypeDirect(vm, prototype);
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool JSObject::setPrototype(JSObject* object, ExecState* exec, JSValue prototype)
</del><ins>+bool JSObject::setPrototype(JSObject* object, ExecState* exec, JSValue prototype, bool shouldThrowIfCantSet)
</ins><span class="cx"> {
</span><del>-    return object-&gt;setPrototypeWithCycleCheck(exec-&gt;vm(), exec, prototype);
</del><ins>+    return object-&gt;setPrototypeWithCycleCheck(exec-&gt;vm(), exec, prototype, shouldThrowIfCantSet);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool JSObject::setPrototype(VM&amp; vm, ExecState* exec, JSValue prototype)
</del><ins>+bool JSObject::setPrototype(VM&amp; vm, ExecState* exec, JSValue prototype, bool shouldThrowIfCantSet)
</ins><span class="cx"> {
</span><del>-    return methodTable(vm)-&gt;setPrototype(this, exec, prototype);
</del><ins>+    return methodTable(vm)-&gt;setPrototype(this, exec, prototype, shouldThrowIfCantSet);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool JSObject::allowsAccessFrom(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (197511 => 197512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h        2016-03-03 18:34:11 UTC (rev 197511)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h        2016-03-03 19:18:35 UTC (rev 197512)
</span><span class="lines">@@ -114,13 +114,13 @@
</span><span class="cx"> private:
</span><span class="cx">     // This is OrdinarySetPrototypeOf in the specification. Section 9.1.2.1
</span><span class="cx">     // https://tc39.github.io/ecma262/#sec-ordinarysetprototypeof
</span><del>-    JS_EXPORT_PRIVATE bool setPrototypeWithCycleCheck(VM&amp;, ExecState*, JSValue prototype);
</del><ins>+    JS_EXPORT_PRIVATE bool setPrototypeWithCycleCheck(VM&amp;, ExecState*, JSValue prototype, bool shouldThrowIfCantSet);
</ins><span class="cx"> public:
</span><span class="cx">     // This is the fully virtual [[SetPrototypeOf]] internal function defined
</span><span class="cx">     // in the ECMAScript 6 specification. Use this when doing a [[SetPrototypeOf]] 
</span><span class="cx">     // operation as dictated in the specification.
</span><del>-    bool setPrototype(VM&amp;, ExecState*, JSValue prototype);
-    JS_EXPORT_PRIVATE static bool setPrototype(JSObject*, ExecState*, JSValue prototype);
</del><ins>+    bool setPrototype(VM&amp;, ExecState*, JSValue prototype, bool shouldThrowIfCantSet = false);
+    JS_EXPORT_PRIVATE static bool setPrototype(JSObject*, ExecState*, JSValue prototype, bool shouldThrowIfCantSet);
</ins><span class="cx">         
</span><span class="cx">     bool mayInterceptIndexedAccesses()
</span><span class="cx">     {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp (197511 => 197512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp        2016-03-03 18:34:11 UTC (rev 197511)
+++ trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp        2016-03-03 19:18:35 UTC (rev 197512)
</span><span class="lines">@@ -209,24 +209,10 @@
</span><span class="cx">     if (!checkProtoSetterAccessAllowed(exec, object))
</span><span class="cx">         return JSValue::encode(objectValue);
</span><span class="cx"> 
</span><del>-    if (object-&gt;prototype() == protoValue)
-        return JSValue::encode(objectValue);
-
-    bool isExtensible = object-&gt;isExtensible(exec);
-    if (exec-&gt;hadException())
-        return JSValue::encode(JSValue());
-    if (!isExtensible)
-        return throwVMError(exec, createTypeError(exec, StrictModeReadonlyPropertyWriteError));
-
</del><span class="cx">     VM&amp; vm = exec-&gt;vm();
</span><del>-    bool didSetPrototype = object-&gt;setPrototype(vm, exec, protoValue);
-    if (vm.exception())
-        return JSValue::encode(JSValue());
-    if (!didSetPrototype) {
-        vm.throwException(exec, createError(exec, ASCIILiteral(&quot;cyclic __proto__ value&quot;)));
-        return JSValue::encode(jsUndefined());
-    }
-
</del><ins>+    bool shouldThrowIfCantSet = true;
+    bool didSetPrototype = object-&gt;setPrototype(vm, exec, protoValue, shouldThrowIfCantSet);
+    ASSERT_UNUSED(didSetPrototype, vm.exception() || didSetPrototype);
</ins><span class="cx">     return JSValue::encode(objectValue);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeReflectObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ReflectObject.cpp (197511 => 197512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ReflectObject.cpp        2016-03-03 18:34:11 UTC (rev 197511)
+++ trunk/Source/JavaScriptCore/runtime/ReflectObject.cpp        2016-03-03 19:18:35 UTC (rev 197512)
</span><span class="lines">@@ -212,17 +212,9 @@
</span><span class="cx">     if (!checkProtoSetterAccessAllowed(exec, object))
</span><span class="cx">         return JSValue::encode(jsBoolean(false));
</span><span class="cx"> 
</span><del>-    if (object-&gt;prototype() == proto)
-        return JSValue::encode(jsBoolean(true));
-
-    bool isExtensible = object-&gt;isExtensible(exec);
-    if (exec-&gt;hadException())
-        return JSValue::encode(JSValue());
-    if (!isExtensible)
-        return JSValue::encode(jsBoolean(false));
-
</del><span class="cx">     VM&amp; vm = exec-&gt;vm();
</span><del>-    bool didSetPrototype = object-&gt;setPrototype(vm, exec, proto);
</del><ins>+    bool shouldThrowIfCantSet = false;
+    bool didSetPrototype = object-&gt;setPrototype(vm, exec, proto, shouldThrowIfCantSet);
</ins><span class="cx">     if (vm.exception())
</span><span class="cx">         return JSValue::encode(JSValue());
</span><span class="cx">     return JSValue::encode(jsBoolean(didSetPrototype));
</span></span></pre>
</div>
</div>

</body>
</html>