<!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>[189561] 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/189561">189561</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-09-09 17:27:32 -0700 (Wed, 09 Sep 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/189522">r189522</a>.
https://bugs.webkit.org/show_bug.cgi?id=149020

&quot;Caused a ~4% Speedometer regression&quot; (Requested by cdumez on
#webkit).

Reverted changeset:

&quot;Function.prototype.bind: Bound functions must use the
[[Prototype]] of their target function instead of
Function.prototype&quot;
https://bugs.webkit.org/show_bug.cgi?id=145605
http://trac.webkit.org/changeset/189522

Patch by Commit Queue &lt;commit-queue@webkit.org&gt; on 2015-09-09</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSBoundFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjecth">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoretestses6yaml">trunk/Source/JavaScriptCore/tests/es6.yaml</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189560 => 189561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-09-09 23:40:55 UTC (rev 189560)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-09-10 00:27:32 UTC (rev 189561)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-09-09  Commit Queue  &lt;commit-queue@webkit.org&gt;
+
+        Unreviewed, rolling out r189522.
+        https://bugs.webkit.org/show_bug.cgi?id=149020
+
+        &quot;Caused a ~4% Speedometer regression&quot; (Requested by cdumez on
+        #webkit).
+
+        Reverted changeset:
+
+        &quot;Function.prototype.bind: Bound functions must use the
+        [[Prototype]] of their target function instead of
+        Function.prototype&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=145605
+        http://trac.webkit.org/changeset/189522
+
</ins><span class="cx"> 2015-09-09  Geoffrey Garen  &lt;ggaren@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix the no-DFG build.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSBoundFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp (189560 => 189561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp        2015-09-09 23:40:55 UTC (rev 189560)
+++ trunk/Source/JavaScriptCore/runtime/JSBoundFunction.cpp        2015-09-10 00:27:32 UTC (rev 189561)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> const ClassInfo JSBoundFunction::s_info = { &quot;Function&quot;, &amp;Base::s_info, 0, CREATE_METHOD_TABLE(JSBoundFunction) };
</span><span class="cx"> 
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL boundFunctionCall(ExecState* exec)
</span><del>-{   
</del><ins>+{
</ins><span class="cx">     JSBoundFunction* boundFunction = jsCast&lt;JSBoundFunction*&gt;(exec-&gt;callee());
</span><span class="cx"> 
</span><span class="cx">     ASSERT(isJSArray(boundFunction-&gt;boundArgs())); // Currently this is true!
</span><span class="lines">@@ -80,10 +80,8 @@
</span><span class="cx">     ConstructType constructType = JSC::getConstructData(targetFunction, constructData);
</span><span class="cx">     bool canConstruct = constructType != ConstructTypeNone;
</span><span class="cx">     NativeExecutable* executable = vm.getHostFunction(boundFunctionCall, canConstruct ? boundFunctionConstruct : callHostFunctionAsConstructor);
</span><del>-    JSValue targetPrototype = targetFunction-&gt;prototype();
-    Structure* structure = JSBoundFunction::createStructure(vm, globalObject, targetPrototype);
-    JSBoundFunction* function = new (NotNull, allocateCell&lt;JSBoundFunction&gt;(vm.heap)) JSBoundFunction(vm, globalObject, structure, targetFunction, boundThis, boundArgs);
-    
</del><ins>+    JSBoundFunction* function = new (NotNull, allocateCell&lt;JSBoundFunction&gt;(vm.heap)) JSBoundFunction(vm, globalObject, globalObject-&gt;boundFunctionStructure(), targetFunction, boundThis, boundArgs);
+
</ins><span class="cx">     function-&gt;finishCreation(vm, executable, length, name);
</span><span class="cx">     return function;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (189560 => 189561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp        2015-09-09 23:40:55 UTC (rev 189560)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp        2015-09-10 00:27:32 UTC (rev 189561)
</span><span class="lines">@@ -271,6 +271,7 @@
</span><span class="cx"> 
</span><span class="cx">     m_functionStructure.set(vm, this, JSFunction::createStructure(vm, this, m_functionPrototype.get()));
</span><span class="cx">     m_arrowFunctionStructure.set(vm, this, JSArrowFunction::createStructure(vm, this, m_functionPrototype.get()));
</span><ins>+    m_boundFunctionStructure.set(vm, this, JSBoundFunction::createStructure(vm, this, m_functionPrototype.get()));
</ins><span class="cx">     m_nativeStdFunctionStructure.set(vm, this, JSNativeStdFunction::createStructure(vm, this, m_functionPrototype.get()));
</span><span class="cx">     m_namedFunctionStructure.set(vm, this, Structure::addPropertyTransition(vm, m_functionStructure.get(), vm.propertyNames-&gt;name, DontDelete | ReadOnly | DontEnum, m_functionNameOffset));
</span><span class="cx">     m_internalFunctionStructure.set(vm, this, InternalFunction::createStructure(vm, this, m_functionPrototype.get()));
</span><span class="lines">@@ -819,6 +820,7 @@
</span><span class="cx">     visitor.append(&amp;thisObject-&gt;m_errorStructure);
</span><span class="cx">     visitor.append(&amp;thisObject-&gt;m_calleeStructure);
</span><span class="cx">     visitor.append(&amp;thisObject-&gt;m_functionStructure);
</span><ins>+    visitor.append(&amp;thisObject-&gt;m_boundFunctionStructure);
</ins><span class="cx">     visitor.append(&amp;thisObject-&gt;m_arrowFunctionStructure);
</span><span class="cx">     visitor.append(&amp;thisObject-&gt;m_nativeStdFunctionStructure);
</span><span class="cx">     visitor.append(&amp;thisObject-&gt;m_namedFunctionStructure);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (189560 => 189561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h        2015-09-09 23:40:55 UTC (rev 189560)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h        2015-09-10 00:27:32 UTC (rev 189561)
</span><span class="lines">@@ -255,6 +255,7 @@
</span><span class="cx">     WriteBarrier&lt;Structure&gt; m_nullPrototypeObjectStructure;
</span><span class="cx">     WriteBarrier&lt;Structure&gt; m_calleeStructure;
</span><span class="cx">     WriteBarrier&lt;Structure&gt; m_functionStructure;
</span><ins>+    WriteBarrier&lt;Structure&gt; m_boundFunctionStructure;
</ins><span class="cx">     WriteBarrier&lt;Structure&gt; m_arrowFunctionStructure;
</span><span class="cx">     WriteBarrier&lt;Structure&gt; m_nativeStdFunctionStructure;
</span><span class="cx">     WriteBarrier&lt;Structure&gt; m_namedFunctionStructure;
</span><span class="lines">@@ -489,6 +490,7 @@
</span><span class="cx">     Structure* errorStructure() const { return m_errorStructure.get(); }
</span><span class="cx">     Structure* calleeStructure() const { return m_calleeStructure.get(); }
</span><span class="cx">     Structure* functionStructure() const { return m_functionStructure.get(); }
</span><ins>+    Structure* boundFunctionStructure() const { return m_boundFunctionStructure.get(); }
</ins><span class="cx">     Structure* arrowFunctionStructure() const { return m_arrowFunctionStructure.get(); }
</span><span class="cx">     Structure* nativeStdFunctionStructure() const { return m_nativeStdFunctionStructure.get(); }
</span><span class="cx">     Structure* namedFunctionStructure() const { return m_namedFunctionStructure.get(); }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestses6yaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/tests/es6.yaml (189560 => 189561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/es6.yaml        2015-09-09 23:40:55 UTC (rev 189560)
+++ trunk/Source/JavaScriptCore/tests/es6.yaml        2015-09-10 00:27:32 UTC (rev 189561)
</span><span class="lines">@@ -881,15 +881,15 @@
</span><span class="cx"> - path: es6/proper_tail_calls_tail_call_optimisation_mutual_recursion.js
</span><span class="cx">   cmd: runES6 :fail
</span><span class="cx"> - path: es6/prototype_of_bound_functions_arrow_functions.js
</span><del>-  cmd: runES6 :normal
</del><ins>+  cmd: runES6 :fail
</ins><span class="cx"> - path: es6/prototype_of_bound_functions_basic_functions.js
</span><del>-  cmd: runES6 :normal
</del><ins>+  cmd: runES6 :fail
</ins><span class="cx"> - path: es6/prototype_of_bound_functions_classes.js
</span><del>-  cmd: runES6 :normal
</del><ins>+  cmd: runES6 :fail
</ins><span class="cx"> - path: es6/prototype_of_bound_functions_generator_functions.js
</span><span class="cx">   cmd: runES6 :fail
</span><span class="cx"> - path: es6/prototype_of_bound_functions_subclasses.js
</span><del>-  cmd: runES6 :normal
</del><ins>+  cmd: runES6 :fail
</ins><span class="cx"> - path: es6/Proxy_apply_handler.js
</span><span class="cx">   cmd: runES6 :fail
</span><span class="cx"> - path: es6/Proxy_Array.isArray_support.js
</span></span></pre>
</div>
</div>

</body>
</html>