<!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>[152677] branches/safari-537-branch</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/152677">152677</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2013-07-15 16:54:29 -0700 (Mon, 15 Jul 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/152573">r152573</a>.  &lt;rdar://problem/13927795&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari537branchLayoutTestsChangeLog">branches/safari-537-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari537branchLayoutTestsfastjsfunctionbindexpectedtxt">branches/safari-537-branch/LayoutTests/fast/js/function-bind-expected.txt</a></li>
<li><a href="#branchessafari537branchLayoutTestsfastjsscripttestsfunctionbindjs">branches/safari-537-branch/LayoutTests/fast/js/script-tests/function-bind.js</a></li>
<li><a href="#branchessafari537branchSourceJavaScriptCoreChangeLog">branches/safari-537-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari537branchSourceJavaScriptCorejitJITThunkscpp">branches/safari-537-branch/Source/JavaScriptCore/jit/JITThunks.cpp</a></li>
<li><a href="#branchessafari537branchSourceJavaScriptCorejitJITThunksh">branches/safari-537-branch/Source/JavaScriptCore/jit/JITThunks.h</a></li>
<li><a href="#branchessafari537branchSourceJavaScriptCoreruntimeJSBoundFunctioncpp">branches/safari-537-branch/Source/JavaScriptCore/runtime/JSBoundFunction.cpp</a></li>
<li><a href="#branchessafari537branchSourceJavaScriptCoreruntimeJSCellcpp">branches/safari-537-branch/Source/JavaScriptCore/runtime/JSCell.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari537branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/LayoutTests/ChangeLog (152676 => 152677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/LayoutTests/ChangeLog        2013-07-15 23:47:51 UTC (rev 152676)
+++ branches/safari-537-branch/LayoutTests/ChangeLog        2013-07-15 23:54:29 UTC (rev 152677)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2013-07-15  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r152573
+
+    2013-07-10  Oliver Hunt  &lt;oliver@apple.com&gt;
+
+            NativeExecutable cache needs to use both call and construct functions for key
+            https://bugs.webkit.org/show_bug.cgi?id=118545
+
+            Reviewed by Geoffrey Garen.
+
+            Make sure we don't decide that all bound functions aren't constructors.
+
+            * fast/js/function-bind-expected.txt:
+            * fast/js/script-tests/function-bind.js:
+
+2013-07-15  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
</ins><span class="cx">         Merge r152554
</span><span class="cx"> 
</span><span class="cx">     2013-07-10  Sam Weinig  &lt;sam@webkit.org&gt;
</span></span></pre></div>
<a id="branchessafari537branchLayoutTestsfastjsfunctionbindexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/LayoutTests/fast/js/function-bind-expected.txt (152676 => 152677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/LayoutTests/fast/js/function-bind-expected.txt        2013-07-15 23:47:51 UTC (rev 152676)
+++ branches/safari-537-branch/LayoutTests/fast/js/function-bind-expected.txt        2013-07-15 23:54:29 UTC (rev 152677)
</span><span class="lines">@@ -3,6 +3,10 @@
</span><span class="cx"> On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+PASS new (decodeURI.bind())() threw exception TypeError: 'function decodeURI() {
+    [native code]
+}' is not a constructor (evaluating 'new (decodeURI.bind())()').
+PASS (new (String.bind())('foo')).toString() is 'foo'
</ins><span class="cx"> PASS result is &quot;[object Window] -&gt; x:1, y:2&quot;
</span><span class="cx"> PASS result is &quot;'a' -&gt; x:'b', y:1&quot;
</span><span class="cx"> PASS result is &quot;'a' -&gt; x:'b', y:'c'&quot;
</span></span></pre></div>
<a id="branchessafari537branchLayoutTestsfastjsscripttestsfunctionbindjs"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/LayoutTests/fast/js/script-tests/function-bind.js (152676 => 152677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/LayoutTests/fast/js/script-tests/function-bind.js        2013-07-15 23:47:51 UTC (rev 152676)
+++ branches/safari-537-branch/LayoutTests/fast/js/script-tests/function-bind.js        2013-07-15 23:54:29 UTC (rev 152677)
</span><span class="lines">@@ -1,5 +1,8 @@
</span><span class="cx"> description(&quot;Tests Function.bind.&quot;);
</span><span class="cx"> 
</span><ins>+shouldThrow(&quot;new (decodeURI.bind())()&quot;);
+shouldBe(&quot;(new (String.bind())('foo')).toString()&quot;, &quot;'foo'&quot;);
+
</ins><span class="cx"> var result;
</span><span class="cx"> 
</span><span class="cx"> function F(x, y)
</span></span></pre></div>
<a id="branchessafari537branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/Source/JavaScriptCore/ChangeLog (152676 => 152677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/Source/JavaScriptCore/ChangeLog        2013-07-15 23:47:51 UTC (rev 152676)
+++ branches/safari-537-branch/Source/JavaScriptCore/ChangeLog        2013-07-15 23:54:29 UTC (rev 152677)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2013-07-15  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
+        Merge r152573
+
+    2013-07-10  Oliver Hunt  &lt;oliver@apple.com&gt;
+
+            NativeExecutable cache needs to use both call and construct functions for key
+            https://bugs.webkit.org/show_bug.cgi?id=118545
+
+            Reviewed by Geoffrey Garen.
+
+            Make the native executable cache make use a key pair so we don't decide to
+            treat all subsequent functions as not being constructors.
+
+            * jit/JITThunks.cpp:
+            (JSC::JITThunks::hostFunctionStub):
+            * jit/JITThunks.h:
+            * runtime/JSBoundFunction.cpp:
+            (JSC::JSBoundFunction::create):
+            * runtime/JSCell.cpp:
+            (JSC::JSCell::getCallData):
+            (JSC::JSCell::getConstructData):
+
</ins><span class="cx"> 2013-07-09  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r152497
</span></span></pre></div>
<a id="branchessafari537branchSourceJavaScriptCorejitJITThunkscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/Source/JavaScriptCore/jit/JITThunks.cpp (152676 => 152677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/Source/JavaScriptCore/jit/JITThunks.cpp        2013-07-15 23:47:51 UTC (rev 152676)
+++ branches/safari-537-branch/Source/JavaScriptCore/jit/JITThunks.cpp        2013-07-15 23:54:29 UTC (rev 152677)
</span><span class="lines">@@ -71,17 +71,17 @@
</span><span class="cx"> 
</span><span class="cx"> NativeExecutable* JITThunks::hostFunctionStub(VM* vm, NativeFunction function, NativeFunction constructor)
</span><span class="cx"> {
</span><del>-    if (NativeExecutable* nativeExecutable = m_hostFunctionStubMap-&gt;get(function))
</del><ins>+    if (NativeExecutable* nativeExecutable = m_hostFunctionStubMap-&gt;get(std::make_pair(function, constructor)))
</ins><span class="cx">         return nativeExecutable;
</span><span class="cx"> 
</span><span class="cx">     NativeExecutable* nativeExecutable = NativeExecutable::create(*vm, JIT::compileCTINativeCall(vm, function), function, MacroAssemblerCodeRef::createSelfManagedCodeRef(ctiNativeConstruct(vm)), constructor, NoIntrinsic);
</span><del>-    weakAdd(*m_hostFunctionStubMap, function, PassWeak&lt;NativeExecutable&gt;(nativeExecutable));
</del><ins>+    weakAdd(*m_hostFunctionStubMap, std::make_pair(function, constructor), PassWeak&lt;NativeExecutable&gt;(nativeExecutable));
</ins><span class="cx">     return nativeExecutable;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> NativeExecutable* JITThunks::hostFunctionStub(VM* vm, NativeFunction function, ThunkGenerator generator, Intrinsic intrinsic)
</span><span class="cx"> {
</span><del>-    if (NativeExecutable* nativeExecutable = m_hostFunctionStubMap-&gt;get(function))
</del><ins>+    if (NativeExecutable* nativeExecutable = m_hostFunctionStubMap-&gt;get(std::make_pair(function, callHostFunctionAsConstructor)))
</ins><span class="cx">         return nativeExecutable;
</span><span class="cx"> 
</span><span class="cx">     MacroAssemblerCodeRef code;
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx">         code = JIT::compileCTINativeCall(vm, function);
</span><span class="cx"> 
</span><span class="cx">     NativeExecutable* nativeExecutable = NativeExecutable::create(*vm, code, function, MacroAssemblerCodeRef::createSelfManagedCodeRef(ctiNativeConstruct(vm)), callHostFunctionAsConstructor, intrinsic);
</span><del>-    weakAdd(*m_hostFunctionStubMap, function, PassWeak&lt;NativeExecutable&gt;(nativeExecutable));
</del><ins>+    weakAdd(*m_hostFunctionStubMap, std::make_pair(function, callHostFunctionAsConstructor), PassWeak&lt;NativeExecutable&gt;(nativeExecutable));
</ins><span class="cx">     return nativeExecutable;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari537branchSourceJavaScriptCorejitJITThunksh"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/Source/JavaScriptCore/jit/JITThunks.h (152676 => 152677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/Source/JavaScriptCore/jit/JITThunks.h        2013-07-15 23:47:51 UTC (rev 152676)
+++ branches/safari-537-branch/Source/JavaScriptCore/jit/JITThunks.h        2013-07-15 23:54:29 UTC (rev 152677)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> private:
</span><span class="cx">     typedef HashMap&lt;ThunkGenerator, MacroAssemblerCodeRef&gt; CTIStubMap;
</span><span class="cx">     CTIStubMap m_ctiStubMap;
</span><del>-    typedef HashMap&lt;NativeFunction, Weak&lt;NativeExecutable&gt; &gt; HostFunctionStubMap;
</del><ins>+    typedef HashMap&lt;pair&lt;NativeFunction, NativeFunction&gt;, Weak&lt;NativeExecutable&gt; &gt; HostFunctionStubMap;
</ins><span class="cx">     OwnPtr&lt;HostFunctionStubMap&gt; m_hostFunctionStubMap;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari537branchSourceJavaScriptCoreruntimeJSBoundFunctioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/Source/JavaScriptCore/runtime/JSBoundFunction.cpp (152676 => 152677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/Source/JavaScriptCore/runtime/JSBoundFunction.cpp        2013-07-15 23:47:51 UTC (rev 152676)
+++ branches/safari-537-branch/Source/JavaScriptCore/runtime/JSBoundFunction.cpp        2013-07-15 23:54:29 UTC (rev 152677)
</span><span class="lines">@@ -79,7 +79,6 @@
</span><span class="cx">     ConstructData constructData;
</span><span class="cx">     ConstructType constructType = JSC::getConstructData(targetFunction, constructData);
</span><span class="cx">     bool canConstruct = constructType != ConstructTypeNone;
</span><del>-
</del><span class="cx">     NativeExecutable* executable = exec-&gt;vm().getHostFunction(boundFunctionCall, canConstruct ? boundFunctionConstruct : callHostFunctionAsConstructor);
</span><span class="cx">     JSBoundFunction* function = new (NotNull, allocateCell&lt;JSBoundFunction&gt;(*exec-&gt;heap())) JSBoundFunction(exec, globalObject, globalObject-&gt;boundFunctionStructure(), targetFunction, boundThis, boundArgs);
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari537branchSourceJavaScriptCoreruntimeJSCellcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/Source/JavaScriptCore/runtime/JSCell.cpp (152676 => 152677)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/Source/JavaScriptCore/runtime/JSCell.cpp        2013-07-15 23:47:51 UTC (rev 152676)
+++ branches/safari-537-branch/Source/JavaScriptCore/runtime/JSCell.cpp        2013-07-15 23:54:29 UTC (rev 152677)
</span><span class="lines">@@ -66,13 +66,19 @@
</span><span class="cx">     return isObject() ? static_cast&lt;const JSObject*&gt;(this) : 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-CallType JSCell::getCallData(JSCell*, CallData&amp;)
</del><ins>+CallType JSCell::getCallData(JSCell*, CallData&amp; callData)
</ins><span class="cx"> {
</span><ins>+    callData.js.functionExecutable = 0;
+    callData.js.scope = 0;
+    callData.native.function = 0;
</ins><span class="cx">     return CallTypeNone;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-ConstructType JSCell::getConstructData(JSCell*, ConstructData&amp;)
</del><ins>+ConstructType JSCell::getConstructData(JSCell*, ConstructData&amp; constructData)
</ins><span class="cx"> {
</span><ins>+    constructData.js.functionExecutable = 0;
+    constructData.js.scope = 0;
+    constructData.native.function = 0;
</ins><span class="cx">     return ConstructTypeNone;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>