<!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>[205742] branches/safari-602-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/205742">205742</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-09-09 08:29:24 -0700 (Fri, 09 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/204403">r204403</a>. rdar://problem/27991568</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchJSTestsChangeLog">branches/safari-602-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoreChangeLog">branches/safari-602-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">branches/safari-602-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchJSTestsstressOverrideHasInstanceshouldnotbranchacrossregisterallocationsjs">branches/safari-602-branch/JSTests/stress/OverrideHasInstance-should-not-branch-across-register-allocations.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/JSTests/ChangeLog (205741 => 205742)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/JSTests/ChangeLog 2016-09-09 15:17:21 UTC (rev 205741)
+++ branches/safari-602-branch/JSTests/ChangeLog 2016-09-09 15:29:24 UTC (rev 205742)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-09-09 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r204403. rdar://problem/27991568
+
+ 2016-08-11 Mark Lam <mark.lam@apple.com>
+
+ OverridesHasInstance should not branch across register allocations.
+ https://bugs.webkit.org/show_bug.cgi?id=160792
+ <rdar://problem/27361778>
+
+ Reviewed by Benjamin Poulain.
+
+ * stress/OverrideHasInstance-should-not-branch-across-register-allocations.js: Added.
+
</ins><span class="cx"> 2016-08-30 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r204570. rdar://problem/27991567
</span></span></pre></div>
<a id="branchessafari602branchJSTestsstressOverrideHasInstanceshouldnotbranchacrossregisterallocationsjs"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/JSTests/stress/OverrideHasInstance-should-not-branch-across-register-allocations.js (0 => 205742)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/JSTests/stress/OverrideHasInstance-should-not-branch-across-register-allocations.js (rev 0)
+++ branches/safari-602-branch/JSTests/stress/OverrideHasInstance-should-not-branch-across-register-allocations.js 2016-09-09 15:29:24 UTC (rev 205742)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+//@ runDefault
+
+// This test should not crash.
+
+delete this.Function;
+
+var test = function() {
+ Math.cos("0" instanceof arguments)
+}
+
+for (var k = 0; k < 10000; ++k) {
+ try {
+ test();
+ } catch (e) {
+ }
+}
</ins></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/ChangeLog (205741 => 205742)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-09-09 15:17:21 UTC (rev 205741)
+++ branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-09-09 15:29:24 UTC (rev 205742)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2016-09-09 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r204403. rdar://problem/27991568
+
+ 2016-08-11 Mark Lam <mark.lam@apple.com>
+
+ OverridesHasInstance should not branch across register allocations.
+ https://bugs.webkit.org/show_bug.cgi?id=160792
+ <rdar://problem/27361778>
+
+ Reviewed by Benjamin Poulain.
+
+ The OverrideHasInstance node has a branch test that is emitted conditionally.
+ It also has a bug where it allocated a register after this branch, which is not
+ allowed and would fail an assertion introduced in https://trac.webkit.org/r145931.
+ From the ChangeLog for r145931:
+
+ "This [assertion that register allocations are not branched around] protects
+ against the case where an allocation could have spilled register contents to free
+ up a register and that spill only occurs on one path of many through the code.
+ A subsequent fill of the spilled register may load garbage."
+
+ Because the branch isn't always emitted, this bug has gone unnoticed until now.
+ This patch fixes this issue by pre-allocating the registers before emitting the
+ branch in OverrideHasInstance.
+
+ Note: this issue is only present in DFGSpeculativeJIT64.cpp. The 32-bit version
+ is doing it right.
+
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+
+2016-09-09 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r204485. rdar://problem/27991572
</span><span class="cx">
</span><span class="cx"> 2016-08-15 Mark Lam <mark.lam@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (205741 => 205742)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2016-09-09 15:17:21 UTC (rev 205741)
+++ branches/safari-602-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2016-09-09 15:29:24 UTC (rev 205742)
</span><span class="lines">@@ -4521,16 +4521,19 @@
</span><span class="cx"> GPRTemporary result(this);
</span><span class="cx">
</span><span class="cx"> GPRReg resultGPR = result.gpr();
</span><ins>+ GPRReg baseGPR = base.gpr();
</ins><span class="cx">
</span><span class="cx"> // If we have proven that the constructor's Symbol.hasInstance will always be the one on Function.prototype[Symbol.hasInstance]
</span><span class="cx"> // then we don't need a runtime check here. We don't worry about the case where the constructor's Symbol.hasInstance is a constant
</span><span class="cx"> // but is not the default one as fixup should have converted this check to true.
</span><span class="cx"> ASSERT(!hasInstanceValueNode->isCellConstant() || defaultHasInstanceFunction == hasInstanceValueNode->asCell());
</span><del>- if (!hasInstanceValueNode->isCellConstant())
- notDefault = m_jit.branchPtr(MacroAssembler::NotEqual, hasInstanceValue.gpr(), TrustedImmPtr(defaultHasInstanceFunction));
</del><ins>+ if (!hasInstanceValueNode->isCellConstant()) {
+ GPRReg hasInstanceValueGPR = hasInstanceValue.gpr();
+ notDefault = m_jit.branchPtr(MacroAssembler::NotEqual, hasInstanceValueGPR, TrustedImmPtr(defaultHasInstanceFunction));
+ }
</ins><span class="cx">
</span><span class="cx"> // Check that base 'ImplementsDefaultHasInstance'.
</span><del>- m_jit.test8(MacroAssembler::Zero, MacroAssembler::Address(base.gpr(), JSCell::typeInfoFlagsOffset()), MacroAssembler::TrustedImm32(ImplementsDefaultHasInstance), resultGPR);
</del><ins>+ m_jit.test8(MacroAssembler::Zero, MacroAssembler::Address(baseGPR, JSCell::typeInfoFlagsOffset()), MacroAssembler::TrustedImm32(ImplementsDefaultHasInstance), resultGPR);
</ins><span class="cx"> m_jit.or32(TrustedImm32(ValueFalse), resultGPR);
</span><span class="cx"> MacroAssembler::Jump done = m_jit.jump();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>