<!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>[169279] branches/safari-537.77-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/169279">169279</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-05-23 13:32:21 -0700 (Fri, 23 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/167832">r167832</a>. <rdar://problem/16975563></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53777branchLayoutTestsChangeLog">branches/safari-537.77-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53777branchSourceJavaScriptCoreChangeLog">branches/safari-537.77-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari53777branchSourceJavaScriptCorejitJITCall32_64cpp">branches/safari-537.77-branch/Source/JavaScriptCore/jit/JITCall32_64.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>branches/safari-537.77-branch/LayoutTests/js/regress/</li>
<li><a href="#branchessafari53777branchLayoutTestsjsregresspolymorphicarraycallexpectedtxt">branches/safari-537.77-branch/LayoutTests/js/regress/polymorphic-array-call-expected.txt</a></li>
<li><a href="#branchessafari53777branchLayoutTestsjsregresspolymorphicarraycallhtml">branches/safari-537.77-branch/LayoutTests/js/regress/polymorphic-array-call.html</a></li>
<li>branches/safari-537.77-branch/LayoutTests/js/regress/script-tests/</li>
<li><a href="#branchessafari53777branchLayoutTestsjsregressscripttestspolymorphicarraycalljs">branches/safari-537.77-branch/LayoutTests/js/regress/script-tests/polymorphic-array-call.js</a></li>
<li><a href="#branchessafari53777branchLayoutTestsresourcesregresspostjs">branches/safari-537.77-branch/LayoutTests/resources/regress-post.js</a></li>
<li><a href="#branchessafari53777branchLayoutTestsresourcesregressprejs">branches/safari-537.77-branch/LayoutTests/resources/regress-pre.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53777branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/LayoutTests/ChangeLog (169278 => 169279)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/ChangeLog 2014-05-23 20:32:20 UTC (rev 169278)
+++ branches/safari-537.77-branch/LayoutTests/ChangeLog 2014-05-23 20:32:21 UTC (rev 169279)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-05-23 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r167832
+
+ 2014-04-25 Oliver Hunt <oliver@apple.com>
+
+ Need earlier cell test
+ https://bugs.webkit.org/show_bug.cgi?id=132211
+
+ Reviewed by Mark Lam.
+
+ Tests
+
+ * js/regress/polymorphic-array-call-expected.txt: Added.
+ * js/regress/polymorphic-array-call.html: Added.
+ * js/regress/script-tests/polymorphic-array-call.js: Added.
+ (func.C.this.m):
+ (func.C):
+ (func):
+
+2014-05-23 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r161008
</span><span class="cx">
</span><span class="cx"> 2013-12-23 Ryosuke Niwa <rniwa@webkit.org>
</span></span></pre></div>
<a id="branchessafari53777branchLayoutTestsjsregresspolymorphicarraycallexpectedtxtfromrev167832trunkLayoutTestsjsregresspolymorphicarraycallexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.77-branch/LayoutTests/js/regress/polymorphic-array-call-expected.txt (from rev 167832, trunk/LayoutTests/js/regress/polymorphic-array-call-expected.txt) (0 => 169279)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/js/regress/polymorphic-array-call-expected.txt (rev 0)
+++ branches/safari-537.77-branch/LayoutTests/js/regress/polymorphic-array-call-expected.txt 2014-05-23 20:32:21 UTC (rev 169279)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/polymorphic-array-call
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari53777branchLayoutTestsjsregresspolymorphicarraycallhtmlfromrev167832trunkLayoutTestsjsregresspolymorphicarraycallhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.77-branch/LayoutTests/js/regress/polymorphic-array-call.html (from rev 167832, trunk/LayoutTests/js/regress/polymorphic-array-call.html) (0 => 169279)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/js/regress/polymorphic-array-call.html (rev 0)
+++ branches/safari-537.77-branch/LayoutTests/js/regress/polymorphic-array-call.html 2014-05-23 20:32:21 UTC (rev 169279)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="../../resources/regress-pre.js"></script>
+<script src="script-tests/polymorphic-array-call.js"></script>
+<script src="../../resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari53777branchLayoutTestsjsregressscripttestspolymorphicarraycalljsfromrev167832trunkLayoutTestsjsregressscripttestspolymorphicarraycalljs"></a>
<div class="copfile"><h4>Copied: branches/safari-537.77-branch/LayoutTests/js/regress/script-tests/polymorphic-array-call.js (from rev 167832, trunk/LayoutTests/js/regress/script-tests/polymorphic-array-call.js) (0 => 169279)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/js/regress/script-tests/polymorphic-array-call.js (rev 0)
+++ branches/safari-537.77-branch/LayoutTests/js/regress/script-tests/polymorphic-array-call.js 2014-05-23 20:32:21 UTC (rev 169279)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+//@ runDefault
+var result = 0;
+function func() {
+ function C() {
+ this.m = function () {
+ result ^= result * 3 + 5 + (result << 3);
+ };
+ };
+ var a=[];
+ for (var i =0; i < 10000; i++) {
+ a[i] = (new C);
+ }
+ a[9000].m = 0.876555555;
+ for (var i = 0; i < 10000; i++)
+ a[i].m();
+}
+try {
+ func();
+} catch(e) {
+
+}
+if (result != 1561806289)
+ throw "Expected 1561806289 but got " + result
</ins></span></pre></div>
<a id="branchessafari53777branchLayoutTestsresourcesregresspostjsfromrev169276trunkLayoutTestsresourcesregresspostjs"></a>
<div class="copfile"><h4>Copied: branches/safari-537.77-branch/LayoutTests/resources/regress-post.js (from rev 169276, trunk/LayoutTests/resources/regress-post.js) (0 => 169279)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/resources/regress-post.js (rev 0)
+++ branches/safari-537.77-branch/LayoutTests/resources/regress-post.js 2014-05-23 20:32:21 UTC (rev 169279)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+if (_JSRegress_didSucceed)
+ debug("PASS no exception thrown");
</ins></span></pre></div>
<a id="branchessafari53777branchLayoutTestsresourcesregresspostjs"></a>
<div class="propset"><h4>Property changes: branches/safari-537.77-branch/LayoutTests/resources/regress-post.js</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="branchessafari53777branchLayoutTestsresourcesregressprejsfromrev169276trunkLayoutTestsresourcesregressprejs"></a>
<div class="copfile"><h4>Copied: branches/safari-537.77-branch/LayoutTests/resources/regress-pre.js (from rev 169276, trunk/LayoutTests/resources/regress-pre.js) (0 => 169279)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/resources/regress-pre.js (rev 0)
+++ branches/safari-537.77-branch/LayoutTests/resources/regress-pre.js 2014-05-23 20:32:21 UTC (rev 169279)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+description("JSRegress/" + ("" + window.location).split('/').pop().split('.')[0]);
+_JSRegress_didSucceed = true;
+_JSRegress_oldOnError = window.onerror;
+window.onerror = function(message) {
+ debug("FAIL caught exception: " + message);
+ _JSRegress_didSucceed = false;
+ _JSRegress_oldOnError.apply(this, arguments);
+}
+
+if (typeof noInline == "undefined") {
+ if (window.testRunner)
+ noInline =window.testRunner.neverInlineFunction || function(){};
+ else
+ noInline = function(){}
+}
+
</ins></span></pre></div>
<a id="branchessafari53777branchLayoutTestsresourcesregressprejs"></a>
<div class="propset"><h4>Property changes: branches/safari-537.77-branch/LayoutTests/resources/regress-pre.js</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<a id="branchessafari53777branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/JavaScriptCore/ChangeLog (169278 => 169279)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/JavaScriptCore/ChangeLog 2014-05-23 20:32:20 UTC (rev 169278)
+++ branches/safari-537.77-branch/Source/JavaScriptCore/ChangeLog 2014-05-23 20:32:21 UTC (rev 169279)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-23 Dana Burkart <dburkart@apple.com>
+
+ Merge r167832
+
+ 2014-04-25 Oliver Hunt <oliver@apple.com>
+
+ Need earlier cell test
+ https://bugs.webkit.org/show_bug.cgi?id=132211
+
+ Reviewed by Mark Lam.
+
+ Move cell test to before the function call repatch
+ location, as the repatch logic for 32bit assumes that the
+ caller will already have performed a cell check.
+
+ * jit/JITCall32_64.cpp:
+ (JSC::JIT::compileOpCall):
+
</ins><span class="cx"> 2014-05-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r165162
</span></span></pre></div>
<a id="branchessafari53777branchSourceJavaScriptCorejitJITCall32_64cpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/JavaScriptCore/jit/JITCall32_64.cpp (169278 => 169279)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/JavaScriptCore/jit/JITCall32_64.cpp 2014-05-23 20:32:20 UTC (rev 169278)
+++ branches/safari-537.77-branch/Source/JavaScriptCore/jit/JITCall32_64.cpp 2014-05-23 20:32:21 UTC (rev 169279)
</span><span class="lines">@@ -269,13 +269,14 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ addSlowCase(branch32(NotEqual, regT1, TrustedImm32(JSValue::CellTag)));
+
</ins><span class="cx"> DataLabelPtr addressOfLinkedFunctionCheck;
</span><span class="cx"> BEGIN_UNINTERRUPTED_SEQUENCE(sequenceOpCall);
</span><span class="cx"> Jump slowCase = branchPtrWithPatch(NotEqual, regT0, addressOfLinkedFunctionCheck, TrustedImmPtr(0));
</span><span class="cx"> END_UNINTERRUPTED_SEQUENCE(sequenceOpCall);
</span><span class="cx">
</span><span class="cx"> addSlowCase(slowCase);
</span><del>- addSlowCase(branch32(NotEqual, regT1, TrustedImm32(JSValue::CellTag)));
</del><span class="cx">
</span><span class="cx"> ASSERT(m_callStructureStubCompilationInfo.size() == callLinkInfoIndex);
</span><span class="cx"> m_callStructureStubCompilationInfo.append(StructureStubCompilationInfo());
</span></span></pre>
</div>
</div>
</body>
</html>